You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/09 12:44:55 UTC
[1/2] git commit: Removed cloud,
region and zone definitions from topology domain model
Updated Branches:
refs/heads/master 524e6a29a -> 19fc9f8b3
Removed cloud, region and zone definitions from topology domain model
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3b1570f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3b1570f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3b1570f5
Branch: refs/heads/master
Commit: 3b1570f5b63f3f1cf82e1f157dec94e9724e8603
Parents: 85c5116
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Dec 9 17:14:28 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 9 17:14:28 2013 +0530
----------------------------------------------------------------------
.../messaging/domain/topology/Cloud.java | 84 --------------------
.../messaging/domain/topology/Cluster.java | 27 -------
.../messaging/domain/topology/Region.java | 79 ------------------
.../stratos/messaging/domain/topology/Zone.java | 55 -------------
4 files changed, 245 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3b1570f5/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cloud.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cloud.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cloud.java
deleted file mode 100644
index 8c3856a..0000000
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cloud.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.messaging.domain.topology;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Defines an IaaS cloud.
- */
-public class Cloud {
- private String cloudId;
- private String cloudName;
- private Properties properties;
- private Map<String, Region> regionMap;
-
- public Cloud() {
- this.regionMap = new HashMap<String, Region>();
- }
-
- public String getCloudId() {
- return cloudId;
- }
-
- public void setCloudId(String cloudId) {
- this.cloudId = cloudId;
- }
-
- public String getCloudName() {
- return cloudName;
- }
-
- public void setCloudName(String cloudName) {
- this.cloudName = cloudName;
- }
-
- public Properties getProperties() {
- return properties;
- }
-
- public void setProperties(Properties properties) {
- this.properties = properties;
- }
-
- public Collection<Region> getRegions() {
- return regionMap.values();
- }
-
- public void addRegion(Region region) {
- regionMap.put(region.getRegionId(), region);
- }
-
- public void removeRegion(Region region) {
- regionMap.remove(region.getRegionId());
- }
-
- public void removeRegion(String regionId) {
- regionMap.remove(regionId);
- }
-
- public Region getRegion(String regionId) {
- return regionMap.get(regionId);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3b1570f5/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
index 362bf72..1bf940a 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
@@ -39,9 +39,6 @@ public class Cluster implements Serializable {
private String tenantRange;
private String autoscalePolicyName;
private String deploymentPolicyName = "economy-deployment";
- private Cloud cloud;
- private Region region;
- private Zone zone;
// Key: Member.memberId
private Map<String, Member> memberMap;
@@ -81,30 +78,6 @@ public class Cluster implements Serializable {
this.tenantRange = tenantRange;
}
- public Cloud getCloud() {
- return cloud;
- }
-
- public void setCloud(Cloud cloud) {
- this.cloud = cloud;
- }
-
- public Region getRegion() {
- return region;
- }
-
- public void setRegion(Region region) {
- this.region = region;
- }
-
- public Zone getZone() {
- return zone;
- }
-
- public void setZone(Zone zone) {
- this.zone = zone;
- }
-
public Collection<Member> getMembers() {
return memberMap.values();
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3b1570f5/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Region.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Region.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Region.java
deleted file mode 100644
index 24cc2b4..0000000
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Region.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.messaging.domain.topology;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Defines a geographical region of IaaS cloud.
- */
-public class Region {
- private String regionId;
- private String regionName;
- private Properties properties;
- private Map<String, Zone> zoneMap;
-
- public String getRegionId() {
- return regionId;
- }
-
- public void setRegionId(String regionId) {
- this.regionId = regionId;
- }
-
- public String getRegionName() {
- return regionName;
- }
-
- public void setRegionName(String regionName) {
- this.regionName = regionName;
- }
-
- public Properties getProperties() {
- return properties;
- }
-
- public void setProperties(Properties properties) {
- this.properties = properties;
- }
-
- public Collection<Zone> getZones() {
- return zoneMap.values();
- }
-
- public void addZone(Zone zone) {
- zoneMap.put(zone.getZoneId(), zone);
- }
-
- public void removeZone(Zone zone) {
- zoneMap.remove(zone.getZoneId());
- }
-
- public void removeZone(String zoneId) {
- zoneMap.remove(zoneId);
- }
-
- public Zone getZone(String zoneId) {
- return zoneMap.get(zoneId);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3b1570f5/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Zone.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Zone.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Zone.java
deleted file mode 100644
index 67d6e47..0000000
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Zone.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.messaging.domain.topology;
-
-import java.util.Properties;
-
-/**
- * Defines a zone in IaaS cloud region.
- */
-public class Zone {
- private String zoneId;
- private String zoneName;
- private Properties properties;
-
- public String getZoneId() {
- return zoneId;
- }
-
- public void setZoneId(String zoneId) {
- this.zoneId = zoneId;
- }
-
- public String getZoneName() {
- return zoneName;
- }
-
- public void setZoneName(String zoneName) {
- this.zoneName = zoneName;
- }
-
- public Properties getProperties() {
- return properties;
- }
-
- public void setProperties(Properties properties) {
- this.properties = properties;
- }
-}
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/19fc9f8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/19fc9f8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/19fc9f8b
Branch: refs/heads/master
Commit: 19fc9f8b301f7d0d9f69efe770022ef9257c6060
Parents: 3b1570f 524e6a2
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Dec 9 17:14:47 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 9 17:14:47 2013 +0530
----------------------------------------------------------------------
.../rule/AutoscalerRuleEvaluator.java | 36 +++++++++++---------
1 file changed, 20 insertions(+), 16 deletions(-)
----------------------------------------------------------------------