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 2015/05/14 11:18:58 UTC
stratos git commit: Removing CartridgeBean.isPublic,
NetworkPartitionBean.partitionAlgo, ChildLevelPartitionBean,
ApplicationPolicyNetworkPartitionReferenceBean, AutoscalePolicy.isPublic,
ChildPolicyBean
Repository: stratos
Updated Branches:
refs/heads/master 73122dd06 -> c1b5f6984
Removing CartridgeBean.isPublic, NetworkPartitionBean.partitionAlgo, ChildLevelPartitionBean, ApplicationPolicyNetworkPartitionReferenceBean, AutoscalePolicy.isPublic, ChildPolicyBean
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c1b5f698
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c1b5f698
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c1b5f698
Branch: refs/heads/master
Commit: c1b5f6984db7c1f85ed2c6566574e7c877c29c13
Parents: 73122dd
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu May 14 14:48:14 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu May 14 14:48:33 2015 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 3 +-
.../openstack/networking/NovaNetworkingApi.java | 10 +-
.../common/beans/cartridge/CartridgeBean.java | 10 --
.../beans/cartridge/CartridgeReferenceBean.java | 3 +
...tionPolicyNetworkPartitionReferenceBean.java | 45 -------
.../ChildLevelNetworkPartitionBean.java | 54 --------
.../partition/ChildLevelPartitionBean.java | 44 -------
.../beans/partition/NetworkPartitionBean.java | 9 --
.../NetworkPartitionReferenceBean.java | 75 +++++++++++
.../common/beans/partition/PartitionBean.java | 22 ----
.../policy/autoscale/AutoscalePolicyBean.java | 9 --
.../policy/deployment/ChildPolicyBean.java | 47 -------
.../stratos/rest/endpoint/mock/MockContext.java | 132 +++----------------
.../util/converter/ObjectConverter.java | 1 -
14 files changed, 104 insertions(+), 360 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 2871a01..ec43014 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -1055,9 +1055,8 @@ public class RestCommandLineService {
RowMapper<AutoscalePolicyBean> rowMapper = new RowMapper<AutoscalePolicyBean>() {
public String[] getData(AutoscalePolicyBean policy) {
- String[] data = new String[2];
+ String[] data = new String[1];
data[0] = policy.getId();
- data[1] = policy.getIsPublic() ? "Public" : "Private";
return data;
}
};
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java
index 55f677a..b0e24f2 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java
@@ -63,13 +63,13 @@ public class NovaNetworkingApi implements OpenstackNetworkingApi {
String region = ComputeServiceBuilderUtil.extractRegion(iaasProvider);
NovaApi novaApi = context.unwrapApi(NovaApi.class);
- FloatingIPApi floatingIp = novaApi.getFloatingIPExtensionForZone(
+ FloatingIPApi floatingIPApi = novaApi.getFloatingIPExtensionForZone(
region).get();
String ip = null;
// first try to find an unassigned IP.
ArrayList<FloatingIP> unassignedIps = Lists.newArrayList(Iterables
- .filter(floatingIp.list(),
+ .filter(floatingIPApi.list(),
new Predicate<FloatingIP>() {
@Override
@@ -91,9 +91,9 @@ public class NovaNetworkingApi implements OpenstackNetworkingApi {
String defaultFloatingIpPool = iaasProvider.getProperty(CloudControllerConstants.DEFAULT_FLOATING_IP_POOL);
FloatingIP allocatedFloatingIP;
if ((defaultFloatingIpPool == null) || "".equals(defaultFloatingIpPool)) {
- allocatedFloatingIP = floatingIp.create();
+ allocatedFloatingIP = floatingIPApi.create();
} else {
- allocatedFloatingIP = floatingIp.allocateFromPool(defaultFloatingIpPool);
+ allocatedFloatingIP = floatingIPApi.allocateFromPool(defaultFloatingIpPool);
}
if (allocatedFloatingIP == null) {
String msg = "Failed to allocate an IP address.";
@@ -121,7 +121,7 @@ public class NovaNetworkingApi implements OpenstackNetworkingApi {
int retries = 0;
//TODO make 5 configurable
while (retries < 5
- && !associateIp(floatingIp, ip, node.getProviderId())) {
+ && !associateIp(floatingIPApi, ip, node.getProviderId())) {
// wait for 5s
CloudControllerUtil.sleep(5000);
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
index 9ce366e..9bd9e78 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeBean.java
@@ -38,7 +38,6 @@ public class CartridgeBean {
private String description;
private String version;
private boolean multiTenant;
- private boolean isPublic;
private DeploymentBean deployment;
private List<PortMappingBean> portMapping;
private String tenantPartitions;
@@ -154,14 +153,6 @@ public class CartridgeBean {
this.multiTenant = multiTenant;
}
- public boolean isPublic() {
- return isPublic;
- }
-
- public void setPublic(boolean isPublic) {
- this.isPublic = isPublic;
- }
-
public DeploymentBean getDeployment() {
return deployment;
}
@@ -236,7 +227,6 @@ public class CartridgeBean {
", Description: " + getDescription() +
", Version: " + getVersion() +
", Multi-Tenant " + isMultiTenant() +
- ", Public " + isPublic() +
", Deployment" + getDeploymentDetails() +
", Port Mapping: " + getPortMappings() +
", Tenant Partitions: " + getTenantPartitions() +
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
index 4207cbd..163bc6c 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
@@ -23,6 +23,9 @@ import org.apache.stratos.common.beans.application.SubscribableInfo;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
+/**
+ * Cartridge reference definition being used in application and cartridge groups.
+ */
@XmlRootElement
public class CartridgeReferenceBean implements Serializable {
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ApplicationPolicyNetworkPartitionReferenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ApplicationPolicyNetworkPartitionReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ApplicationPolicyNetworkPartitionReferenceBean.java
deleted file mode 100644
index 6dd13d2..0000000
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ApplicationPolicyNetworkPartitionReferenceBean.java
+++ /dev/null
@@ -1,45 +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.common.beans.partition;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class ApplicationPolicyNetworkPartitionReferenceBean {
-
- private String id;
- private boolean activeByDefault;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public boolean isActiveByDefault() {
- return activeByDefault;
- }
-
- public void setActiveByDefault(boolean activeByDefault) {
- this.activeByDefault = activeByDefault;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ChildLevelNetworkPartitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ChildLevelNetworkPartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ChildLevelNetworkPartitionBean.java
deleted file mode 100644
index 3a995a9..0000000
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ChildLevelNetworkPartitionBean.java
+++ /dev/null
@@ -1,54 +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.common.beans.partition;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-@XmlRootElement
-public class ChildLevelNetworkPartitionBean {
-
- private String id;
- private String partitionAlgo;
- private List<ChildLevelPartitionBean> partitions;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getPartitionAlgo() {
- return partitionAlgo;
- }
-
- public void setPartitionAlgo(String partitionAlgo) {
- this.partitionAlgo = partitionAlgo;
- }
-
- public List<ChildLevelPartitionBean> getPartitions() {
- return partitions;
- }
-
- public void setPartitions(List<ChildLevelPartitionBean> partitions) {
- this.partitions = partitions;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ChildLevelPartitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ChildLevelPartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ChildLevelPartitionBean.java
deleted file mode 100644
index 1572a2a..0000000
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/ChildLevelPartitionBean.java
+++ /dev/null
@@ -1,44 +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.common.beans.partition;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class ChildLevelPartitionBean {
-
- private String id;
- private int max;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public int getMax() {
- return max;
- }
-
- public void setMax(int max) {
- this.max = max;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
index f96f3a4..3a31903 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
@@ -30,7 +30,6 @@ public class NetworkPartitionBean {
private String id;
private String provider;
private List<PartitionBean> partitions;
- private String partitionAlgo;
private List<PropertyBean> properties;
public String getId() {
@@ -57,14 +56,6 @@ public class NetworkPartitionBean {
this.provider = provider;
}
- public String getPartitionAlgo() {
- return partitionAlgo;
- }
-
- public void setPartitionAlgo(String partitionAlgo) {
- this.partitionAlgo = partitionAlgo;
- }
-
public List<PropertyBean> getProperties() {
return properties;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java
new file mode 100644
index 0000000..227eef9
--- /dev/null
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionReferenceBean.java
@@ -0,0 +1,75 @@
+/*
+ * 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.common.beans.partition;
+
+import org.apache.stratos.common.beans.PropertyBean;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+
+@XmlRootElement
+public class NetworkPartitionReferenceBean {
+
+ private String id;
+ private String provider;
+ private List<PartitionBean> partitions;
+ private String partitionAlgo;
+ private List<PropertyBean> properties;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public List<PartitionBean> getPartitions() {
+ return partitions;
+ }
+
+ public void setPartitions(List<PartitionBean> partitions) {
+ this.partitions = partitions;
+ }
+
+ public String getProvider() {
+ return provider;
+ }
+
+ public void setProvider(String provider) {
+ this.provider = provider;
+ }
+
+ public String getPartitionAlgo() {
+ return partitionAlgo;
+ }
+
+ public void setPartitionAlgo(String partitionAlgo) {
+ this.partitionAlgo = partitionAlgo;
+ }
+
+ public List<PropertyBean> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(List<PropertyBean> properties) {
+ this.properties = properties;
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
index 0ab32b7..ae7fba3 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionBean.java
@@ -29,8 +29,6 @@ public class PartitionBean {
private String id;
private String description;
- private boolean isPublic;
- private String kubernetesClusterId;
private List<PropertyBean> property;
private int partitionMax;
@@ -42,18 +40,6 @@ public class PartitionBean {
this.id = id;
}
- public boolean getIsPublic() {
- return isPublic();
- }
-
- public boolean isPublic() {
- return isPublic;
- }
-
- public void setPublic(boolean isPublic) {
- this.isPublic = isPublic;
- }
-
public String getDescription() {
return description;
}
@@ -70,14 +56,6 @@ public class PartitionBean {
this.property = property;
}
- public String getKubernetesClusterId() {
- return kubernetesClusterId;
- }
-
- public void setKubernetesClusterId(String kubernetesClusterId) {
- this.kubernetesClusterId = kubernetesClusterId;
- }
-
public int getPartitionMax() {
return partitionMax;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
index 97464b1..5dc025d 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
@@ -28,7 +28,6 @@ public class AutoscalePolicyBean {
private String displayName;
private String description;
private LoadThresholdsBean loadThresholds;
- private boolean isPublic;
public String getId() {
return id;
@@ -61,12 +60,4 @@ public class AutoscalePolicyBean {
public void setLoadThresholds(LoadThresholdsBean loadThresholds) {
this.loadThresholds = loadThresholds;
}
-
- public boolean getIsPublic() {
- return isPublic;
- }
-
- public void setIsPublic(boolean isPublic) {
- this.isPublic = isPublic;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ChildPolicyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ChildPolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ChildPolicyBean.java
deleted file mode 100644
index b022b4c..0000000
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ChildPolicyBean.java
+++ /dev/null
@@ -1,47 +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.common.beans.policy.deployment;
-
-import org.apache.stratos.common.beans.partition.ChildLevelNetworkPartitionBean;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-@XmlRootElement
-public class ChildPolicyBean {
-
- private String alias;
- private List<ChildLevelNetworkPartitionBean> networkPartition;
-
- public String getAlias() {
- return alias;
- }
-
- public void setAlias(String alias) {
- this.alias = alias;
- }
-
- public List<ChildLevelNetworkPartitionBean> getNetworkPartition() {
- return networkPartition;
- }
-
- public void setNetworkPartition(List<ChildLevelNetworkPartitionBean> networkPartition) {
- this.networkPartition = networkPartition;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
index 9996af6..0f4bc39 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
@@ -63,20 +63,11 @@ public class MockContext {
int tenantId = getTenantId();
List<CartridgeBean> tenantCartridges;
- if (!cartridgeDefinitionBean.isPublic()) {
- if (this.cartridgeDefinitionBeanList.containsKey(tenantId)) {
- tenantCartridges = this.cartridgeDefinitionBeanList.get(tenantId);
- } else {
- tenantCartridges = new LinkedList<CartridgeBean>();
- this.cartridgeDefinitionBeanList.put(tenantId, tenantCartridges);
- }
+ if (this.cartridgeDefinitionBeanList.containsKey(PUBLIC_DEFINITION)) {
+ tenantCartridges = this.cartridgeDefinitionBeanList.get(PUBLIC_DEFINITION);
} else {
- if (this.cartridgeDefinitionBeanList.containsKey(PUBLIC_DEFINITION)) {
- tenantCartridges = this.cartridgeDefinitionBeanList.get(PUBLIC_DEFINITION);
- } else {
- tenantCartridges = new LinkedList<CartridgeBean>();
- this.cartridgeDefinitionBeanList.put(PUBLIC_DEFINITION, tenantCartridges);
- }
+ tenantCartridges = new LinkedList<CartridgeBean>();
+ this.cartridgeDefinitionBeanList.put(PUBLIC_DEFINITION, tenantCartridges);
}
tenantCartridges.add(cartridgeDefinitionBean);
@@ -88,45 +79,25 @@ public class MockContext {
cartridge.setMultiTenant(cartridgeDefinitionBean.isMultiTenant());
cartridge.setProvider(cartridgeDefinitionBean.getProvider());
cartridge.setVersion(cartridgeDefinitionBean.getVersion());
- //cartridge.setIsPublic(cartridgeDefinitionBean.isPublic());
Map<String, CartridgeBean> cartridges;
if (cartridge.isMultiTenant()) {
- if (!cartridge.isPublic()) {
- if (this.availableMultiTenantCartridges.containsKey(tenantId)) {
- cartridges = availableMultiTenantCartridges.get(tenantId);
- } else {
- cartridges = new HashMap<String, CartridgeBean>();
- this.availableMultiTenantCartridges.put(tenantId, cartridges);
- }
+ if (this.availableMultiTenantCartridges.containsKey(tenantId)) {
+ cartridges = availableMultiTenantCartridges.get(tenantId);
} else {
- if (this.availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)) {
- cartridges = availableMultiTenantCartridges.get(PUBLIC_DEFINITION);
- } else {
- cartridges = new HashMap<String, CartridgeBean>();
- this.availableMultiTenantCartridges.put(PUBLIC_DEFINITION, cartridges);
- }
+ cartridges = new HashMap<String, CartridgeBean>();
+ this.availableMultiTenantCartridges.put(tenantId, cartridges);
}
cartridges.put(cartridge.getType(), cartridge);
System.out.println(cartridges.size());
} else {
- if (!cartridge.isPublic()) {
- if (this.availableSingleTenantCartridges.containsKey(tenantId)) {
- cartridges = availableSingleTenantCartridges.get(tenantId);
- } else {
- cartridges = new HashMap<String, CartridgeBean>();
- this.availableSingleTenantCartridges.put(tenantId, cartridges);
- }
+ if (this.availableSingleTenantCartridges.containsKey(tenantId)) {
+ cartridges = availableSingleTenantCartridges.get(tenantId);
} else {
- if (this.availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)) {
- cartridges = availableSingleTenantCartridges.get(PUBLIC_DEFINITION);
- } else {
- cartridges = new HashMap<String, CartridgeBean>();
- this.availableSingleTenantCartridges.put(PUBLIC_DEFINITION, cartridges);
- }
+ cartridges = new HashMap<String, CartridgeBean>();
+ this.availableSingleTenantCartridges.put(tenantId, cartridges);
}
-
cartridges.put(cartridge.getType(), cartridge);
System.out.println(cartridges.size());
}
@@ -174,55 +145,10 @@ public class MockContext {
}
public CartridgeBean[] getAvailableLbCartridges() throws RestAPIException {
- /*Map<String,Cartridge> availableLbCartridges = new HashMap<String,Cartridge>();
- Iterator it = availableSingleTenantCartridges.entrySet().iterator();
- while(it.hasNext()){
- Map.Entry pairs = (Map.Entry)it.next();
- Cartridge cartridge = (Cartridge)pairs.getValue();
- if(cartridge.getSubscriptionDomain().equals("lb")){
- availableLbCartridges.put(cartridge.getSubscriptionDomain(),cartridge);
- }
- it.remove();
- }
-
- it = availableMultiTenantCartridges.entrySet().iterator();
- while(it.hasNext()){
- Map.Entry pairs = (Map.Entry)it.next();
- Cartridge cartridge = (Cartridge)pairs.getValue();
- if(cartridge.getSubscriptionDomain().equals("lb")){
- availableLbCartridges.put(cartridge.getSubscriptionDomain(),cartridge);
- }
- it.remove();
- }
- return availableLbCartridges.values().toArray(new Cartridge[0]);*/
- //return availableSingleTenantCartridges.values().toArray(new Cartridge[0]);
return getAvailableSingleTenantCartridges();
}
public CartridgeBean[] getAvailableCartridges() throws RestAPIException {
- /*Map<String, Cartridge> availableCartridges = new HashMap<String,Cartridge>();
- Iterator it = availableSingleTenantCartridges.entrySet().iterator();
- while(it.hasNext()){
- Map.Entry pairs = (Map.Entry)it.next();
- Cartridge cartridge = (Cartridge)pairs.getValue();
- if(!cartridge.getSubscriptionDomain().equals("lb")){
- availableCartridges.put(cartridge.getSubscriptionDomain(),cartridge);
- }
- it.remove();
- }
-
- it = availableMultiTenantCartridges.entrySet().iterator();
- while(it.hasNext()){
- Map.Entry pairs = (Map.Entry)it.next();
- Cartridge cartridge = (Cartridge)pairs.getValue();
- if(!cartridge.getSubscriptionDomain().equals("lb")){
- availableCartridges.put(cartridge.getSubscriptionDomain(),cartridge);
- }
- it.remove();
- }
- System.out.println(availableCartridges.size());
- return availableCartridges.values().toArray(new Cartridge[0]);*/
- //return availableSingleTenantCartridges.values().toArray(new Cartridge[0]);
return getAvailableSingleTenantCartridges();
}
@@ -423,20 +349,11 @@ public class MockContext {
int tenantId = getTenantId();
Map<String, PartitionBean> partitions;
- if (!partition.isPublic()) {
- if (partitionMap.containsKey(tenantId)) {
- partitions = partitionMap.get(tenantId);
- } else {
- partitions = new HashMap<String, PartitionBean>();
- partitionMap.put(tenantId, partitions);
- }
+ if (partitionMap.containsKey(tenantId)) {
+ partitions = partitionMap.get(tenantId);
} else {
- if (partitionMap.containsKey(PUBLIC_DEFINITION)) {
- partitions = partitionMap.get(PUBLIC_DEFINITION);
- } else {
- partitions = new HashMap<String, PartitionBean>();
- partitionMap.put(PUBLIC_DEFINITION, partitions);
- }
+ partitions = new HashMap<String, PartitionBean>();
+ partitionMap.put(tenantId, partitions);
}
partitions.put(partition.getId(), partition);
@@ -449,20 +366,11 @@ public class MockContext {
int tenantId = getTenantId();
Map<String, AutoscalePolicyBean> policies;
- if (!autoscalePolicy.getIsPublic()) {
- if (autoscalePolicyMap.containsKey(tenantId)) {
- policies = autoscalePolicyMap.get(tenantId);
- } else {
- policies = new HashMap<String, AutoscalePolicyBean>();
- autoscalePolicyMap.put(tenantId, policies);
- }
+ if (autoscalePolicyMap.containsKey(tenantId)) {
+ policies = autoscalePolicyMap.get(tenantId);
} else {
- if (autoscalePolicyMap.containsKey(PUBLIC_DEFINITION)) {
- policies = autoscalePolicyMap.get(PUBLIC_DEFINITION);
- } else {
- policies = new HashMap<String, AutoscalePolicyBean>();
- autoscalePolicyMap.put(PUBLIC_DEFINITION, policies);
- }
+ policies = new HashMap<String, AutoscalePolicyBean>();
+ autoscalePolicyMap.put(tenantId, policies);
}
policies.put(autoscalePolicy.getId(), autoscalePolicy);
http://git-wip-us.apache.org/repos/asf/stratos/blob/c1b5f698/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 29c4f92..30ede69 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -74,7 +74,6 @@ public class ObjectConverter {
cartridge.setCategory(cartridgeBean.getCategory());
cartridge.setVersion(cartridgeBean.getVersion());
cartridge.setMultiTenant(cartridgeBean.isMultiTenant());
- cartridge.setIsPublic(cartridgeBean.isPublic());
cartridge.setDisplayName(cartridgeBean.getDisplayName());
cartridge.setDescription(cartridgeBean.getDescription());
cartridge.setTenantPartitions(cartridgeBean.getTenantPartitions());