You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/04/07 09:35:10 UTC
[1/6] stratos git commit: Formatting cloud controller code
Repository: stratos
Updated Branches:
refs/heads/master 65e8f1673 -> 4e7c18116
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-7.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-7.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-7.xml
index 97d4a1d..993e3cd 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-7.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-7.xml
@@ -21,42 +21,42 @@
-->
<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
-
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php" version="5.1">
- <!-- Display name of this cartridge -->
- <displayName>PHP</displayName>
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- </iaasProvider>
-
- <deployment>
- <dir>abc</dir>
- </deployment>
- </cartridge>
-
- </cartridges>
-<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
-
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php" version="5.1">
- <!-- Display name of this cartridge -->
- <displayName>PHP</displayName>
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- </iaasProvider>
-
- <deployment>
- <dir>abc</dir>
- </deployment>
- </cartridge>
-
- </cartridges>
+<cartridges>
+
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="php" version="5.1">
+ <!-- Display name of this cartridge -->
+ <displayName>PHP</displayName>
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ </iaasProvider>
+
+ <deployment>
+ <dir>abc</dir>
+ </deployment>
+ </cartridge>
+
+</cartridges>
+ <!-- Use below section to specify properties that are needed in order to start Cartridges. -->
+<cartridges>
+
+<!-- You can have 1..n cartridge elements. -->
+<cartridge type="php" version="5.1">
+ <!-- Display name of this cartridge -->
+ <displayName>PHP</displayName>
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ </iaasProvider>
+
+ <deployment>
+ <dir>abc</dir>
+ </deployment>
+</cartridge>
+
+</cartridges>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-8.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-8.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-8.xml
index 22d2c11..1bc3cd4 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-8.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-8.xml
@@ -20,95 +20,95 @@
-->
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php" version="5">
- <!-- Display name of this cartridge -->
- <displayName>PHP</displayName>
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
- <property name="ss" value="slsls"/>
-
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="instanceType" value="1"/>
- <property name="payload" value="resources/as.txt"/>
- </iaasProvider>
- <iaasProvider type="ec2" >
- <imageId>xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="securityGroups" value="manager,cep,mb,default"/>
- <property name="instanceType" value="m1.large"/>
- <property name="payload" value="resources/as-ec2.txt"/>
- </iaasProvider>
-
- <deployment>
- <dir>abc/def</dir>
- </deployment>
-
- <appTypes>
- <appType name="axis2services" appSpecificMapping="true"/>
- <appType name="webapps" appSpecificMapping="false"/>
- </appTypes>
- </cartridge>
-
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+<!-- You can have 1..n cartridge elements. -->
+<cartridge type="php" version="5">
+ <!-- Display name of this cartridge -->
+ <displayName>PHP</displayName>
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+ <property name="ss" value="slsls"/>
- 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
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="instanceType" value="1"/>
+ <property name="payload" value="resources/as.txt"/>
+ </iaasProvider>
+ <iaasProvider type="ec2">
+ <imageId>xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="securityGroups" value="manager,cep,mb,default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="payload" value="resources/as-ec2.txt"/>
+ </iaasProvider>
- http://www.apache.org/licenses/LICENSE-2.0
+ <deployment>
+ <dir>abc/def</dir>
+ </deployment>
- 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.
+ <appTypes>
+ <appType name="axis2services" appSpecificMapping="true"/>
+ <appType name="webapps" appSpecificMapping="false"/>
+ </appTypes>
+</cartridge>
--->
+ <?xml version="1.0" encoding="ISO-8859-1"?>
+ <!--
+
+ 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.
+
+ -->
+
+ <!-- You can have 1..n cartridge elements. -->
+<cartridge type="php" version="5">
+<!-- Display name of this cartridge -->
+<displayName>PHP</displayName>
+<!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+<property name="ss" value="slsls"/>
+
+<!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+<iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="instanceType" value="1"/>
+ <property name="payload" value="resources/as.txt"/>
+</iaasProvider>
+<iaasProvider type="ec2">
+ <imageId>xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="securityGroups" value="manager,cep,mb,default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="payload" value="resources/as-ec2.txt"/>
+</iaasProvider>
+
+<deployment>
+ <dir>abc/def</dir>
+</deployment>
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php" version="5">
- <!-- Display name of this cartridge -->
- <displayName>PHP</displayName>
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
- <property name="ss" value="slsls"/>
-
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="instanceType" value="1"/>
- <property name="payload" value="resources/as.txt"/>
- </iaasProvider>
- <iaasProvider type="ec2" >
- <imageId>xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="securityGroups" value="manager,cep,mb,default"/>
- <property name="instanceType" value="m1.large"/>
- <property name="payload" value="resources/as-ec2.txt"/>
- </iaasProvider>
-
- <deployment>
- <dir>abc/def</dir>
- </deployment>
-
- <appTypes>
- <appType name="axis2services" appSpecificMapping="true"/>
- <appType name="webapps" appSpecificMapping="false"/>
- </appTypes>
- </cartridge>
+<appTypes>
+ <appType name="axis2services" appSpecificMapping="true"/>
+ <appType name="webapps" appSpecificMapping="false"/>
+</appTypes>
+</cartridge>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-9.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-9.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-9.xml
index e3d5e0d..9d2070d 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-9.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-9.xml
@@ -21,68 +21,68 @@
-->
<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
-
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="as" host="abc.com" provider="carbon" version="5.1.0" multiTenant="true">
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
- <property name="ss" value="slsls"/>
- <property name="ss" value="slsls"/>
- <description>This is a WSO2 AS cartridge.</description>
- <deployment baseDir="xyz">
- <dir>abc</dir>
- </deployment>
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="instanceType" value="1"/>
- <property name="payload" value="resources/as.txt"/>
- </iaasProvider>
- <iaasProvider type="ec2" >
- <imageId>xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="securityGroups" value="manager,cep,mb,default"/>
- <property name="instanceType" value="m1.large"/>
- <property name="payload" value="resources/as-ec2.txt"/>
- </iaasProvider>
-
- </cartridge>
-
- </cartridges>
-<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
-
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="as" host="abc.com" provider="carbon" version="5.1.0" multiTenant="true">
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
- <property name="ss" value="slsls"/>
- <property name="ss" value="slsls"/>
- <description>This is a WSO2 AS cartridge.</description>
- <deployment baseDir="xyz">
- <dir>abc</dir>
- </deployment>
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="instanceType" value="1"/>
- <property name="payload" value="resources/as.txt"/>
- </iaasProvider>
- <iaasProvider type="ec2" >
- <imageId>xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="securityGroups" value="manager,cep,mb,default"/>
- <property name="instanceType" value="m1.large"/>
- <property name="payload" value="resources/as-ec2.txt"/>
- </iaasProvider>
-
- </cartridge>
-
- </cartridges>
+<cartridges>
+
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="as" host="abc.com" provider="carbon" version="5.1.0" multiTenant="true">
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+ <property name="ss" value="slsls"/>
+ <property name="ss" value="slsls"/>
+ <description>This is a WSO2 AS cartridge.</description>
+ <deployment baseDir="xyz">
+ <dir>abc</dir>
+ </deployment>
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="instanceType" value="1"/>
+ <property name="payload" value="resources/as.txt"/>
+ </iaasProvider>
+ <iaasProvider type="ec2">
+ <imageId>xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="securityGroups" value="manager,cep,mb,default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="payload" value="resources/as-ec2.txt"/>
+ </iaasProvider>
+
+ </cartridge>
+
+</cartridges>
+ <!-- Use below section to specify properties that are needed in order to start Cartridges. -->
+<cartridges>
+
+<!-- You can have 1..n cartridge elements. -->
+<cartridge type="as" host="abc.com" provider="carbon" version="5.1.0" multiTenant="true">
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+ <property name="ss" value="slsls"/>
+ <property name="ss" value="slsls"/>
+ <description>This is a WSO2 AS cartridge.</description>
+ <deployment baseDir="xyz">
+ <dir>abc</dir>
+ </deployment>
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="instanceType" value="1"/>
+ <property name="payload" value="resources/as.txt"/>
+ </iaasProvider>
+ <iaasProvider type="ec2">
+ <imageId>xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="securityGroups" value="manager,cep,mb,default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="payload" value="resources/as-ec2.txt"/>
+ </iaasProvider>
+
+</cartridge>
+
+</cartridges>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml
index 0d56822..677b020 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cloud-controller.xml
@@ -16,55 +16,55 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
- -->
+ -->
<cloudController xmlns:svns="http://org.wso2.securevault/configuration">
- <svns:secureVault
- provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" />
-
- <dataPublisher enable="true">
- <!-- BAM Server Info - default values are 'admin' and 'admin'
- Optional element. -->
- <bamServer>
- <adminUserName>nirmal</adminUserName>
- <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">nirmal</adminPassword>
- </bamServer>
- <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
- Optional element. -->
- <cron>1 * * * * ? *</cron>
- <!-- Cassandra cluster related info -->
- <cassandraInfo>
- <connectionUrl>localhost:9160</connectionUrl>
- <userName>admin</userName>
- <password svns:secretAlias="cloud.controller.cassandra.server.password">admin</password>
- </cassandraInfo>
- </dataPublisher>
-
- <topologySync enable="true">
- <!-- properties related to topology syncher -->
- <property name="cron" value="1 * * * * ? *"/>
- </topologySync>
-
- <!-- Specify the properties that are common to an IaaS here. This element
- is not necessary [0..1]. But you can use this section to avoid specifying
- same property over and over again. -->
- <iaasProviders>
- <!--<iaasProvider type="ec2" name="EC2 specific details"> <provider>aws-ec2</provider>
- <identity svns:secretAlias="elastic.scaler.ec2.identity">cdcd</identity>
- <credential svns:secretAlias="elastic.scaler.ec2.credential">cdccdc</credential>
- <scaleUpOrder>2</scaleUpOrder> <scaleDownOrder>1</scaleDownOrder> <property
- name="A.x" value="a"/> <property name="B" value="b"/> <imageId>tempEC2</imageId>
- </iaasProvider> -->
- <iaasProvider type="openstack" name="openstack specific details">
- <className>org.apache.stratos.cloud.controller.iaasese.OpenstackNovaIaas</className>
- <provider>openstack-nova</provider>
- <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity>
- <credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential>
- <property name="jclouds.endpoint" value="http://172.17.0.1:5000/" />
- <property name="jclouds.api-version" value="2.0/" />
- <property name="region" value="x" />
- <property name="Y" value="y" />
- <imageId>tempLXC</imageId>
- </iaasProvider>
- </iaasProviders>
+ <svns:secureVault
+ provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler"/>
+
+ <dataPublisher enable="true">
+ <!-- BAM Server Info - default values are 'admin' and 'admin'
+ Optional element. -->
+ <bamServer>
+ <adminUserName>nirmal</adminUserName>
+ <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">nirmal</adminPassword>
+ </bamServer>
+ <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
+ Optional element. -->
+ <cron>1 * * * * ? *</cron>
+ <!-- Cassandra cluster related info -->
+ <cassandraInfo>
+ <connectionUrl>localhost:9160</connectionUrl>
+ <userName>admin</userName>
+ <password svns:secretAlias="cloud.controller.cassandra.server.password">admin</password>
+ </cassandraInfo>
+ </dataPublisher>
+
+ <topologySync enable="true">
+ <!-- properties related to topology syncher -->
+ <property name="cron" value="1 * * * * ? *"/>
+ </topologySync>
+
+ <!-- Specify the properties that are common to an IaaS here. This element
+ is not necessary [0..1]. But you can use this section to avoid specifying
+ same property over and over again. -->
+ <iaasProviders>
+ <!--<iaasProvider type="ec2" name="EC2 specific details"> <provider>aws-ec2</provider>
+ <identity svns:secretAlias="elastic.scaler.ec2.identity">cdcd</identity>
+ <credential svns:secretAlias="elastic.scaler.ec2.credential">cdccdc</credential>
+ <scaleUpOrder>2</scaleUpOrder> <scaleDownOrder>1</scaleDownOrder> <property
+ name="A.x" value="a"/> <property name="B" value="b"/> <imageId>tempEC2</imageId>
+ </iaasProvider> -->
+ <iaasProvider type="openstack" name="openstack specific details">
+ <className>org.apache.stratos.cloud.controller.iaasese.OpenstackNovaIaas</className>
+ <provider>openstack-nova</provider>
+ <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity>
+ <credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential>
+ <property name="jclouds.endpoint" value="http://172.17.0.1:5000/"/>
+ <property name="jclouds.api-version" value="2.0/"/>
+ <property name="region" value="x"/>
+ <property name="Y" value="y"/>
+ <imageId>tempLXC</imageId>
+ </iaasProvider>
+ </iaasProviders>
</cloudController>
[5/6] stratos git commit: Formatting cloud controller code
Posted by la...@apache.org.
Formatting cloud controller code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/de76b388
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/de76b388
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/de76b388
Branch: refs/heads/master
Commit: de76b3883b1a25d654e7c65bd7593d4c5bc3ceee
Parents: 65e8f16
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Apr 7 13:04:35 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Apr 7 13:04:35 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.cloud.controller/pom.xml | 42 +-
.../config/CloudControllerConfig.java | 4 +-
.../parser/CloudControllerConfigParser.java | 23 +-
.../config/parser/IaasProviderConfigParser.java | 11 +-
.../context/CloudControllerContext.java | 72 +--
.../deployers/CloudControllerDeployer.java | 10 +-
.../cloud/controller/domain/AppType.java | 51 +-
.../domain/ApplicationClusterContext.java | 20 +-
.../cloud/controller/domain/Cartridge.java | 160 ++---
.../cloud/controller/domain/ClusterContext.java | 58 +-
.../domain/CompositeApplicationDefinition.java | 72 ++-
.../controller/domain/ConfigCartridge.java | 18 +-
.../controller/domain/ConfigDependencies.java | 42 +-
.../controller/domain/ConfigDependencyPair.java | 52 +-
.../cloud/controller/domain/ConfigGroup.java | 58 +-
.../cloud/controller/domain/Container.java | 64 +-
.../domain/ContainerClusterContext.java | 13 +-
.../controller/domain/DataPublisherConfig.java | 5 +-
.../cloud/controller/domain/Dependencies.java | 18 +-
.../controller/domain/FloatingNetwork.java | 107 ++--
.../controller/domain/FloatingNetworks.java | 28 +-
.../cloud/controller/domain/IaasConfig.java | 42 +-
.../cloud/controller/domain/IaasProvider.java | 102 +--
.../controller/domain/LoadbalancerConfig.java | 10 +-
.../cloud/controller/domain/MemberContext.java | 65 +-
.../controller/domain/NetworkInterface.java | 175 +++---
.../controller/domain/NetworkInterfaces.java | 34 +-
.../controller/domain/NetworkPartition.java | 24 +-
.../cloud/controller/domain/Partition.java | 33 +-
.../cloud/controller/domain/PortMapping.java | 84 +--
.../cloud/controller/domain/Registrant.java | 24 +-
.../cloud/controller/domain/ServiceGroup.java | 16 +-
.../cloud/controller/domain/TopologyConfig.java | 21 +-
.../stratos/cloud/controller/domain/Volume.java | 106 ++--
.../domain/kubernetes/KubernetesCluster.java | 2 +-
.../kubernetes/KubernetesClusterContext.java | 148 +++--
...ApplicationClusterRegistrationException.java | 8 +-
.../ApplicationDefinitionException.java | 8 +-
.../CartridgeDefinitionNotExistsException.java | 12 +-
.../exception/CartridgeNotFoundException.java | 14 +-
.../exception/CloudControllerException.java | 4 +-
.../ClusterInstanceCreationException.java | 8 +-
.../exception/DeserializationException.java | 4 +-
.../InvalidCartridgeDefinitionException.java | 18 +-
.../InvalidCartridgeTypeException.java | 18 +-
.../exception/InvalidClusterException.java | 18 +-
...CompositeApplicationDefinitionException.java | 18 +-
.../exception/InvalidHostException.java | 18 +-
.../exception/InvalidIaasProviderException.java | 18 +-
.../InvalidKubernetesClusterException.java | 6 +-
.../InvalidKubernetesHostException.java | 6 +-
.../InvalidKubernetesMasterException.java | 6 +-
.../exception/InvalidMemberException.java | 18 +-
.../exception/InvalidPartitionException.java | 14 +-
.../exception/InvalidRegionException.java | 14 +-
.../exception/InvalidServiceGroupException.java | 24 +-
.../exception/InvalidXMLException.java | 16 +-
.../exception/InvalidZoneException.java | 14 +-
.../KubernetesEndpointValidationException.java | 5 +-
.../MemberTerminationFailedException.java | 17 +-
.../NetworkPartitionAlreadyExistsException.java | 8 +-
.../NetworkPartitionNotExistsException.java | 8 +-
.../exception/NoInstanceFoundException.java | 12 +-
.../NonExistingKubernetesClusterException.java | 6 +-
.../NonExistingKubernetesHostException.java | 6 +-
.../NonExistingKubernetesMasterException.java | 6 +-
.../exception/SerializationException.java | 14 +-
.../exception/UnregisteredClusterException.java | 12 +-
.../stratos/cloud/controller/iaases/Iaas.java | 3 +
.../cloud/controller/iaases/JcloudsIaas.java | 49 +-
.../controller/iaases/JcloudsIaasUtil.java | 2 +-
.../controller/iaases/PartitionValidator.java | 6 +-
.../CloudControllerServiceComponent.java | 68 +-
.../internal/ServiceReferenceHolder.java | 18 +-
.../controller/registry/RegistryManager.java | 21 +-
.../services/CloudControllerService.java | 626 ++++++++++---------
.../util/CloudControllerConstants.java | 496 +++++++--------
.../controller/util/CloudControllerUtil.java | 166 ++---
.../util/ComputeServiceBuilderUtil.java | 64 +-
.../src/main/resources/META-INF/component.xml | 2 +-
.../src/main/resources/cartridge.xsd | 255 ++++----
.../src/main/resources/cartridges.xsd | 282 ++++-----
.../src/main/resources/service.xsd | 87 +--
.../src/main/resources/services.xsd | 97 +--
.../service/axiom/AxiomValidationTest.java | 58 +-
.../service/axiom/AxiomXpathParserTest.java | 22 +-
.../axiom/CloudControllerContextTest.java | 72 +--
.../src/test/resources/cartridges-1.xml | 64 +-
.../src/test/resources/cartridges-2.xml | 64 +-
.../src/test/resources/cartridges-3.xml | 30 +-
.../src/test/resources/cartridges-4.xml | 62 +-
.../src/test/resources/cartridges-5.xml | 56 +-
.../src/test/resources/cartridges-6.xml | 36 +-
.../src/test/resources/cartridges-7.xml | 78 +--
.../src/test/resources/cartridges-8.xml | 172 ++---
.../src/test/resources/cartridges-9.xml | 130 ++--
.../src/test/resources/cloud-controller.xml | 98 +--
97 files changed, 2698 insertions(+), 2678 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index d969d29..51139ee 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -49,11 +49,11 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- !org.apache.stratos.cloud.controller.internal.*,
- org.apache.stratos.cloud.controller.*,
+ !org.apache.stratos.cloud.controller.internal.*,
+ org.apache.stratos.cloud.controller.*,
</Export-Package>
<Private-Package>
- org.apache.stratos.cloud.controller.internal.*,
+ org.apache.stratos.cloud.controller.internal.*,
</Private-Package>
<Import-Package>
!org.apache.commons.logging,
@@ -70,20 +70,20 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl-maven-plugin</artifactId>
- <configuration>
- <className>org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceImpl</className>
- <outputFileName>target/generated-resources/wsdl/CloudControllerService.wsdl</outputFileName>
- <serviceName>CloudControllerService</serviceName>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>java2wsdl</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl-maven-plugin</artifactId>
+ <configuration>
+ <className>org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceImpl</className>
+ <outputFileName>target/generated-resources/wsdl/CloudControllerService.wsdl</outputFileName>
+ <serviceName>CloudControllerService</serviceName>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java2wsdl</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -110,7 +110,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
+ <groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.kubernetes.client</artifactId>
<version>${project.version}</version>
</dependency>
@@ -248,9 +248,9 @@
<version>${jclouds.stratos.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>gce</artifactId>
- <version>${jclouds.stratos.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>gce</artifactId>
+ <version>${jclouds.stratos.version}</version>
</dependency>
<dependency>
<groupId>com.jamesmurty.utils.wso2</groupId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/CloudControllerConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/CloudControllerConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/CloudControllerConfig.java
index 6af58fb..0735b00 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/CloudControllerConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/CloudControllerConfig.java
@@ -66,12 +66,12 @@ public class CloudControllerConfig {
}
public IaasProvider getIaasProvider(String type) {
- if(type == null) {
+ if (type == null) {
return null;
}
for (IaasProvider iaasProvider : iaasProviders) {
- if(type.equals(iaasProvider.getType())) {
+ if (type.equals(iaasProvider.getType())) {
return iaasProvider;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
index 0f2491b..f1e3db4 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
@@ -37,8 +37,6 @@ import java.util.List;
/**
* Parse the cloud-controller.xml
- *
- *
*/
public class CloudControllerConfigParser {
private static final Log log = LogFactory.getLog(CloudControllerConfigParser.class);
@@ -46,6 +44,7 @@ public class CloudControllerConfigParser {
/**
* Parse the cloud-controller.xml file.
+ *
* @param documentElement document element.
* @throws MalformedConfigurationFileException
*/
@@ -53,14 +52,12 @@ public class CloudControllerConfigParser {
extractIaasProviders(documentElement, AxiomXpathParserUtil.getMatchingNodes(documentElement, CloudControllerConstants.IAAS_PROVIDER_XPATH));
extractDataPublisherConfig(documentElement, AxiomXpathParserUtil.getElement(FILE_NAME, documentElement, CloudControllerConstants.DATA_PUBLISHER_ELEMENT,
- CloudControllerConstants.DATA_PUBLISHER_XPATH));
+ CloudControllerConstants.DATA_PUBLISHER_XPATH));
extractTopologySyncConfig(documentElement, AxiomXpathParserUtil.getElement(FILE_NAME, documentElement, CloudControllerConstants.TOPOLOGY_SYNC_ELEMENT,
- CloudControllerConstants.TOPOLOGY_SYNC_XPATH));
+ CloudControllerConstants.TOPOLOGY_SYNC_XPATH));
}
-
-
private static void extractIaasProviders(OMElement documentElement, List<OMNode> nodeList) {
List<IaasProvider> iaasProviders = CloudControllerConfig.getInstance().getIaasProviders();
@@ -71,18 +68,18 @@ public class CloudControllerConfigParser {
// this is a valid scenario. User can have 0..1 iaas provider elements
// in cloud-controller xml.
if (nodeList == null || nodeList.isEmpty()) {
- log.debug("No IaasProvider element found in "+FILE_NAME);
+ log.debug("No IaasProvider element found in " + FILE_NAME);
return;
}
-
+
for (OMNode node : nodeList) {
iaasProviders.add(IaasProviderConfigParser.getIaasProvider(FILE_NAME, documentElement, node, null));
}
}
-
+
private static void extractDataPublisherConfig(OMElement documentElement, OMElement element) {
if (element == null) {
- log.debug("No data publisher config found in "+FILE_NAME);
+ log.debug("No data publisher config found in " + FILE_NAME);
return;
}
@@ -102,7 +99,7 @@ public class CloudControllerConfigParser {
DataPublisherConfig dataPublisherConfig = new DataPublisherConfig();
config.setDataPubConfig(dataPublisherConfig);
-
+
if (childElement != null) {
// set bam user name
elt =
@@ -170,13 +167,13 @@ public class CloudControllerConfigParser {
private static void extractTopologySyncConfig(OMElement elt, OMElement element) {
if (element == null) {
- log.debug("No Topology sync config is found "+FILE_NAME);
+ log.debug("No Topology sync config is found " + FILE_NAME);
return;
}
// get enable attribute
boolean isEnable = Boolean.parseBoolean(element.getAttributeValue(new QName(
- CloudControllerConstants.ENABLE_ATTR)));
+ CloudControllerConstants.ENABLE_ATTR)));
CloudControllerConfig config = CloudControllerConfig.getInstance();
config.setEnableTopologySync(isEnable);
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/IaasProviderConfigParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/IaasProviderConfigParser.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/IaasProviderConfigParser.java
index aa98450..959388d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/IaasProviderConfigParser.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/IaasProviderConfigParser.java
@@ -35,8 +35,6 @@ import java.util.Map;
/**
* Parse the iaas providers.
- *
- *
*/
public class IaasProviderConfigParser {
private static final Log log = LogFactory.getLog(IaasProviderConfigParser.class);
@@ -103,7 +101,7 @@ public class IaasProviderConfigParser {
return iaas;
}
-
+
private static void loadClassName(final String fileName, final IaasProvider iaas, final OMElement iaasElt) {
Iterator<?> it =
@@ -227,7 +225,6 @@ public class IaasProviderConfigParser {
}
-
public static void loadProperties(final String fileName, final OMElement elt, final Map<String, String> propertyMap) {
Iterator<?> it =
@@ -247,7 +244,7 @@ public class IaasProviderConfigParser {
}
propertyMap.put(prop.getAttribute(new QName(CloudControllerConstants.PROPERTY_NAME_ATTR))
- .getAttributeValue(),
+ .getAttributeValue(),
prop.getAttribute(new QName(CloudControllerConstants.PROPERTY_VALUE_ATTR))
.getAttributeValue());
}
@@ -296,8 +293,8 @@ public class IaasProviderConfigParser {
}
-
- private static void handleException(final String msg) throws MalformedConfigurationFileException{
+
+ private static void handleException(final String msg) throws MalformedConfigurationFileException {
log.error(msg);
throw new MalformedConfigurationFileException(msg);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
index 52036c5..f9a73c3 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
@@ -62,7 +62,7 @@ public class CloudControllerContext implements Serializable {
private static final String CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP = "CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP";
private static final String CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP = "CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP";
private static final String CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP = "CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP";
- private static final String CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP = "CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP";
+ private static final String CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP = "CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP";
private static final String CC_CLUSTER_CTX_WRITE_LOCK = "CC_CLUSTER_CTX_WRITE_LOCK";
private static final String CC_MEMBER_CTX_WRITE_LOCK = "CC_MEMBER_CTX_WRITE_LOCK";
@@ -79,8 +79,8 @@ public class CloudControllerContext implements Serializable {
private final transient DistributedObjectProvider distributedObjectProvider;
/* We keep following maps in order to make the look up time, small. */
-
- /**
+
+ /**
* KubernetesClusters against clusterIds
* Key - Kubernetes cluster id
* Value - {@link org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesCluster}
@@ -144,12 +144,12 @@ public class CloudControllerContext implements Serializable {
*/
private Map<String, ServiceGroup> serviceGroupNameToServiceGroupMap;
- /**
- * Map of network partitions
- * Key - network partition id
- * Value network partition
- */
- private Map<String, NetworkPartition> networkPartitionIDToNetworkPartitionMap;
+ /**
+ * Map of network partitions
+ * Key - network partition id
+ * Value network partition
+ */
+ private Map<String, NetworkPartition> networkPartitionIDToNetworkPartitionMap;
/**
* Key - cartridge id (cartridge type is used as an unique identifier)
@@ -192,7 +192,7 @@ public class CloudControllerContext implements Serializable {
cartridgeTypeToPartitionIdsMap = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP);
cartridgeTypeToCartridgeMap = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP);
serviceGroupNameToServiceGroupMap = distributedObjectProvider.getMap(CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP);
- networkPartitionIDToNetworkPartitionMap = distributedObjectProvider.getMap(CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP);
+ networkPartitionIDToNetworkPartitionMap = distributedObjectProvider.getMap(CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP);
partitionToIaasProviderByCartridge = distributedObjectProvider.getMap(CC_PARTITION_TO_IAAS_PROVIDER_BY_CARTRIDGE_MAP);
cartridgeTypeToIaasProviders = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_IAAS_PROVIDER_MAP);
// Update context from the registry
@@ -215,13 +215,13 @@ public class CloudControllerContext implements Serializable {
}
public void addCartridges(List<Cartridge> cartridges) {
- for(Cartridge cartridge : cartridges) {
+ for (Cartridge cartridge : cartridges) {
addCartridge(cartridge);
}
}
public void addServiceGroups(List<ServiceGroup> serviceGroups) {
- for(ServiceGroup serviceGroup : serviceGroups) {
+ for (ServiceGroup serviceGroup : serviceGroups) {
addServiceGroup(serviceGroup);
}
}
@@ -274,24 +274,24 @@ public class CloudControllerContext implements Serializable {
cartridgeTypeToCartridgeMap.put(cartridge.getType(), cartridge);
}
- public void addNetworkPartition(NetworkPartition networkPartition) {
- networkPartitionIDToNetworkPartitionMap.put(networkPartition.getId(), networkPartition);
- }
+ public void addNetworkPartition(NetworkPartition networkPartition) {
+ networkPartitionIDToNetworkPartitionMap.put(networkPartition.getId(), networkPartition);
+ }
- public NetworkPartition getNetworkPartition(String networkPartitionID) {
- return networkPartitionIDToNetworkPartitionMap.get(networkPartitionID);
- }
-
- public Collection<NetworkPartition> getNetworkPartitions() {
- return networkPartitionIDToNetworkPartitionMap.values();
- }
+ public NetworkPartition getNetworkPartition(String networkPartitionID) {
+ return networkPartitionIDToNetworkPartitionMap.get(networkPartitionID);
+ }
- public void removeNetworkPartition(String networkPartitionID) {
- networkPartitionIDToNetworkPartitionMap.remove(networkPartitionID);
- }
+ public Collection<NetworkPartition> getNetworkPartitions() {
+ return networkPartitionIDToNetworkPartitionMap.values();
+ }
+
+ public void removeNetworkPartition(String networkPartitionID) {
+ networkPartitionIDToNetworkPartitionMap.remove(networkPartitionID);
+ }
- public void removeCartridge(Cartridge cartridge) {
- if(cartridgeTypeToCartridgeMap.containsKey(cartridge.getType())) {
+ public void removeCartridge(Cartridge cartridge) {
+ if (cartridgeTypeToCartridgeMap.containsKey(cartridge.getType())) {
cartridgeTypeToCartridgeMap.remove(cartridge.getType());
}
}
@@ -309,13 +309,13 @@ public class CloudControllerContext implements Serializable {
}
public void removeServiceGroups(List<ServiceGroup> serviceGroups) {
- for(ServiceGroup serviceGroup : serviceGroups) {
+ for (ServiceGroup serviceGroup : serviceGroups) {
removeServiceGroup(serviceGroup);
}
}
private void removeServiceGroup(ServiceGroup serviceGroup) {
- if(serviceGroupNameToServiceGroupMap.containsKey(serviceGroup.getName())) {
+ if (serviceGroupNameToServiceGroupMap.containsKey(serviceGroup.getName())) {
serviceGroupNameToServiceGroupMap.remove(serviceGroup.getName());
}
}
@@ -499,7 +499,7 @@ public class CloudControllerContext implements Serializable {
kubClusterIdToKubClusterContextMap.put(
kubernetesClusterContext.getKubernetesClusterId(), kubernetesClusterContext);
}
-
+
/**
* Remove a registered Kubernetes cluster from registry
*/
@@ -559,7 +559,7 @@ public class CloudControllerContext implements Serializable {
public void updateKubernetesCluster(KubernetesCluster kubernetesCluster) {
kubernetesClustersMap.put(kubernetesCluster.getClusterId(), kubernetesCluster);
}
-
+
public boolean kubernetesClusterExists(KubernetesCluster kubernetesCluster) {
return kubernetesClustersMap.containsKey(kubernetesCluster);
}
@@ -703,13 +703,13 @@ public class CloudControllerContext implements Serializable {
}
private void copyMap(Map sourceMap, Map destinationMap) {
- for(Object key : sourceMap.keySet()) {
+ for (Object key : sourceMap.keySet()) {
destinationMap.put(key, sourceMap.get(key));
}
}
private void copyList(List sourceList, List destinationList) {
- for(Object item : sourceList) {
+ for (Object item : sourceList) {
destinationList.add(item);
}
}
@@ -730,7 +730,7 @@ public class CloudControllerContext implements Serializable {
public void addIaasProviders(String cartridgeType, Map<String, IaasProvider> map) {
Map<String, IaasProvider> partitionToIaasProviders;
- if(partitionToIaasProviderByCartridge.get(cartridgeType) != null) {
+ if (partitionToIaasProviderByCartridge.get(cartridgeType) != null) {
partitionToIaasProviders = partitionToIaasProviderByCartridge.get(cartridgeType);
} else {
partitionToIaasProviders = new ConcurrentHashMap<String, IaasProvider>();
@@ -789,12 +789,12 @@ public class CloudControllerContext implements Serializable {
cartridgeTypeToIaasProviders.put(cartridgeType, iaasProviders);
}
- public IaasProvider getIaasProvider(String cartridgeType, String iaasType){
+ public IaasProvider getIaasProvider(String cartridgeType, String iaasType) {
List<IaasProvider> iaasProviders = cartridgeTypeToIaasProviders.get(cartridgeType);
if (iaasProviders != null) {
for (IaasProvider iaasProvider : iaasProviders) {
- if(iaasProvider.getType().equals(iaasType)){
+ if (iaasProvider.getType().equals(iaasType)) {
return iaasProvider;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
index e3484f1..e0c9422 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
@@ -73,12 +73,12 @@ public class CloudControllerDeployer extends AbstractDeployer {
// update map
fileToIaasProviderListMap.put(deploymentFileData.getAbsolutePath(),
- new ArrayList<IaasProvider>(
- CloudControllerConfig.getInstance()
- .getIaasProviders()));
+ new ArrayList<IaasProvider>(
+ CloudControllerConfig.getInstance()
+ .getIaasProviders()));
log.info("Successfully deployed the cloud-controller XML file located at " +
- deploymentFileData.getAbsolutePath());
+ deploymentFileData.getAbsolutePath());
}
}
@@ -90,7 +90,7 @@ public class CloudControllerDeployer extends AbstractDeployer {
// remove 'em
CloudControllerConfig.getInstance().getIaasProviders().removeAll(fileToIaasProviderListMap.get(file));
log.info("Successfully un-deployed the cloud-controller XML file specified at " +
- file);
+ file);
}
CloudControllerConfig.getInstance().setDataPubConfig(null);
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java
index 738c0aa..4fa31fe 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/AppType.java
@@ -22,40 +22,39 @@ import java.io.Serializable;
/**
* domain mapping related data.
- *
*/
-public class AppType implements Serializable{
-
+public class AppType implements Serializable {
+
private static final long serialVersionUID = 3550489774139807168L;
- private String name;
- private boolean appSpecificMapping = true;
-
- public AppType() {
- }
-
- public AppType(String name){
- this.setName(name);
- }
-
- public AppType(String name, boolean appSpecificMapping){
- this.setName(name);
- this.setAppSpecificMapping(appSpecificMapping);
- }
-
- public String getName() {
- return name;
+ private String name;
+ private boolean appSpecificMapping = true;
+
+ public AppType() {
+ }
+
+ public AppType(String name) {
+ this.setName(name);
+ }
+
+ public AppType(String name, boolean appSpecificMapping) {
+ this.setName(name);
+ this.setAppSpecificMapping(appSpecificMapping);
+ }
+
+ public String getName() {
+ return name;
}
- public void setName(String name) {
- this.name = name;
+ public void setName(String name) {
+ this.name = name;
}
- public boolean isAppSpecificMapping() {
- return appSpecificMapping;
+ public boolean isAppSpecificMapping() {
+ return appSpecificMapping;
}
- public void setAppSpecificMapping(boolean appSpecificMapping) {
- this.appSpecificMapping = appSpecificMapping;
+ public void setAppSpecificMapping(boolean appSpecificMapping) {
+ this.appSpecificMapping = appSpecificMapping;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
index d213705..a6a1250 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ApplicationClusterContext.java
@@ -41,8 +41,8 @@ public class ApplicationClusterContext {
private String tenantRange;
// properties
private Properties properties;
- //dependencyclusterid
- private String[] dependencyClusterIds;
+ //dependencyclusterid
+ private String[] dependencyClusterIds;
private boolean isVolumeRequired;
@@ -117,7 +117,7 @@ public class ApplicationClusterContext {
public boolean equals(Object other) {
- if(other == null || !(other instanceof ApplicationClusterContext)) {
+ if (other == null || !(other instanceof ApplicationClusterContext)) {
return false;
}
@@ -125,7 +125,7 @@ public class ApplicationClusterContext {
return true;
}
- ApplicationClusterContext that = (ApplicationClusterContext)other;
+ ApplicationClusterContext that = (ApplicationClusterContext) other;
return this.cartridgeType.equals(that.cartridgeType) &&
this.clusterId.equals(that.clusterId);
@@ -143,13 +143,13 @@ public class ApplicationClusterContext {
this.properties = properties;
}
- public String[] getDependencyClusterIds() {
- return dependencyClusterIds;
- }
+ public String[] getDependencyClusterIds() {
+ return dependencyClusterIds;
+ }
- public void setDependencyClusterIds(String[] dependencyClusterIds) {
- this.dependencyClusterIds = dependencyClusterIds;
- }
+ public void setDependencyClusterIds(String[] dependencyClusterIds) {
+ this.dependencyClusterIds = dependencyClusterIds;
+ }
public boolean isVolumeRequired() {
return isVolumeRequired;
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
index 5196aba..6c78642 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
@@ -31,15 +31,15 @@ import java.util.*;
/**
* Holds information regarding a Cartridge.
*/
-public class Cartridge implements Serializable{
+public class Cartridge implements Serializable {
- private transient static final Log log = LogFactory.getLog(Cartridge.class);
+ private transient static final Log log = LogFactory.getLog(Cartridge.class);
private static final long serialVersionUID = 6637409027085059072L;
- private String type;
+ private String type;
private String hostName;
private String provider;
- private String category;
+ private String category;
private String displayName;
private String description;
private String baseDir;
@@ -50,7 +50,7 @@ public class Cartridge implements Serializable{
private Persistence persistence;
private AppType[] appTypeMappings;
private String loadBalancingIPType;
- private String[] metadataKeys;
+ private String[] metadataKeys;
private boolean isPublic;
@@ -64,10 +64,10 @@ public class Cartridge implements Serializable{
private IaasConfig[] iaasConfigs;
- public Cartridge(){
- init();
+ public Cartridge() {
+ init();
}
-
+
public Cartridge(String type, String host, String provider, String version, boolean multiTenant) {
this.type = type;
this.hostName = host;
@@ -76,7 +76,7 @@ public class Cartridge implements Serializable{
this.multiTenant = multiTenant;
init();
}
-
+
private void init() {
tenantPartitions = "*";
properties = new Properties();
@@ -89,7 +89,7 @@ public class Cartridge implements Serializable{
public void setType(String type) {
this.type = type;
}
-
+
public void addProperty(String key, String val) {
if (key != null && val != null) {
Property property = new Property();
@@ -107,26 +107,26 @@ public class Cartridge implements Serializable{
this.properties = properties;
}
- public boolean equals(Object obj) {
- if (obj instanceof Cartridge) {
- return this.type.equals(((Cartridge)obj).getType());
- }
- return false;
- }
-
+ public boolean equals(Object obj) {
+ if (obj instanceof Cartridge) {
+ return this.type.equals(((Cartridge) obj).getType());
+ }
+ return false;
+ }
+
public int hashCode() {
return new HashCodeBuilder(17, 31). // two randomly chosen prime numbers
- append(type).
- toHashCode();
+ append(type).
+ toHashCode();
}
- public String getDisplayName() {
- return displayName;
- }
+ public String getDisplayName() {
+ return displayName;
+ }
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
public String getDescription() {
return description;
@@ -136,23 +136,23 @@ public class Cartridge implements Serializable{
this.description = description;
}
- public String getHostName() {
- return hostName;
+ public String getHostName() {
+ return hostName;
}
- public void setHostName(String hostName) {
- this.hostName = hostName;
+ public void setHostName(String hostName) {
+ this.hostName = hostName;
}
-
- public void reset(){
- }
- public String[] getDeploymentDirs() {
- return deploymentDirs;
+ public void reset() {
}
- public void setDeploymentDirs(String[] deploymentDirs) {
- this.deploymentDirs = deploymentDirs;
+ public String[] getDeploymentDirs() {
+ return deploymentDirs;
+ }
+
+ public void setDeploymentDirs(String[] deploymentDirs) {
+ this.deploymentDirs = deploymentDirs;
}
public void addDeploymentDir(String dir) {
@@ -176,64 +176,64 @@ public class Cartridge implements Serializable{
appTypeList.toArray(this.appTypeMappings);
}
- public String getProvider() {
- return provider;
+ public String getProvider() {
+ return provider;
}
- public void setProvider(String provider) {
- this.provider = provider;
+ public void setProvider(String provider) {
+ this.provider = provider;
}
- public String getVersion() {
- return version;
- }
+ public String getVersion() {
+ return version;
+ }
- public void setVersion(String version) {
- this.version = version;
- }
+ public void setVersion(String version) {
+ this.version = version;
+ }
- public boolean isMultiTenant() {
- return multiTenant;
- }
+ public boolean isMultiTenant() {
+ return multiTenant;
+ }
- public void setMultiTenant(boolean multiTenant) {
- this.multiTenant = multiTenant;
- }
+ public void setMultiTenant(boolean multiTenant) {
+ this.multiTenant = multiTenant;
+ }
- public String getBaseDir() {
- return baseDir;
+ public String getBaseDir() {
+ return baseDir;
}
- public void setBaseDir(String baseDir) {
- this.baseDir = baseDir;
+ public void setBaseDir(String baseDir) {
+ this.baseDir = baseDir;
}
- public PortMapping[] getPortMappings() {
- return portMappings;
+ public PortMapping[] getPortMappings() {
+ return portMappings;
}
- public void setPortMappings(PortMapping[] portMappings) {
- this.portMappings = portMappings;
+ public void setPortMappings(PortMapping[] portMappings) {
+ this.portMappings = portMappings;
}
- public AppType[] getAppTypeMappings() {
- return appTypeMappings;
+ public AppType[] getAppTypeMappings() {
+ return appTypeMappings;
}
- public void setAppTypeMappings(AppType[] appTypeMappings) {
- this.appTypeMappings = appTypeMappings;
+ public void setAppTypeMappings(AppType[] appTypeMappings) {
+ this.appTypeMappings = appTypeMappings;
}
/**
- * @return the persistence
- */
+ * @return the persistence
+ */
public Persistence getPersistence() {
return persistence;
}
/**
- * @param persistence the persistenceMappings to set
- */
+ * @param persistence the persistenceMappings to set
+ */
public void setPersistence(Persistence persistence) {
this.persistence = persistence;
}
@@ -246,13 +246,13 @@ public class Cartridge implements Serializable{
this.exportingProperties = exportingProperties;
}
- public String getCategory() {
- return category;
- }
+ public String getCategory() {
+ return category;
+ }
- public void setCategory(String category) {
- this.category = category;
- }
+ public void setCategory(String category) {
+ this.category = category;
+ }
public String getTenantPartitions() {
return tenantPartitions;
@@ -262,13 +262,13 @@ public class Cartridge implements Serializable{
this.tenantPartitions = tenantPartitions;
}
- public String[] getMetadataKeys() {
- return metadataKeys;
- }
+ public String[] getMetadataKeys() {
+ return metadataKeys;
+ }
- public void setMetadataKeys(String[] metadataKeys) {
- this.metadataKeys = metadataKeys;
- }
+ public void setMetadataKeys(String[] metadataKeys) {
+ this.metadataKeys = metadataKeys;
+ }
public String getLoadBalancingIPType() {
return loadBalancingIPType;
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java
index f786626..3d3edbb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java
@@ -27,10 +27,8 @@ import java.util.List;
/**
* Holds runtime data of a Cluster.
- *
- *
*/
-public class ClusterContext implements Serializable{
+public class ClusterContext implements Serializable {
private static final long serialVersionUID = 4830667953031229223L;
@@ -80,41 +78,41 @@ public class ClusterContext implements Serializable{
return hostName;
}
- public boolean isLbCluster() {
- return isLbCluster;
- }
+ public boolean isLbCluster() {
+ return isLbCluster;
+ }
- public boolean isVolumeRequired() {
- return isVolumeRequired;
- }
+ public boolean isVolumeRequired() {
+ return isVolumeRequired;
+ }
- public void setVolumeRequired(boolean isVolumeRequired) {
- this.isVolumeRequired = isVolumeRequired;
- }
+ public void setVolumeRequired(boolean isVolumeRequired) {
+ this.isVolumeRequired = isVolumeRequired;
+ }
- public long getTimeoutInMillis() {
- return timeoutInMillis;
- }
+ public long getTimeoutInMillis() {
+ return timeoutInMillis;
+ }
- public void setTimeoutInMillis(long timeoutInMillis) {
- this.timeoutInMillis = timeoutInMillis;
- }
+ public void setTimeoutInMillis(long timeoutInMillis) {
+ this.timeoutInMillis = timeoutInMillis;
+ }
- public Volume[] getVolumes() {
- return volumes;
- }
+ public Volume[] getVolumes() {
+ return volumes;
+ }
- public void setVolumes(Volume[] volumes) {
- this.volumes = ArrayUtils.clone(volumes);
- }
+ public void setVolumes(Volume[] volumes) {
+ this.volumes = ArrayUtils.clone(volumes);
+ }
- public Properties getProperties() {
- return properties;
- }
+ public Properties getProperties() {
+ return properties;
+ }
- public void setProperties(Properties properties) {
- this.properties = properties;
- }
+ public void setProperties(Properties properties) {
+ this.properties = properties;
+ }
public List<KubernetesService> getKubernetesServices() {
return kubernetesServices;
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CompositeApplicationDefinition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CompositeApplicationDefinition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CompositeApplicationDefinition.java
index 62d46ce..286d477 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CompositeApplicationDefinition.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CompositeApplicationDefinition.java
@@ -2,37 +2,45 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class CompositeApplicationDefinition implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private String applicationId;
- private String alias;
- private ConfigGroup[] components;
- private ConfigCartridge [] cartridges;
- public ConfigCartridge[] getCartridges() {
- return cartridges;
- }
- public void setCartridges(ConfigCartridge[] cartridges) {
- this.cartridges = cartridges;
- }
- public String getApplicationId() {
- return applicationId;
- }
- public void setApplicationId(String applicationId) {
- this.applicationId = applicationId;
- }
- public String getAlias() {
- return alias;
- }
- public void setAlias(String alias) {
- this.alias = alias;
- }
- public ConfigGroup[] getComponents() {
- return components;
- }
- public void setComponents(ConfigGroup[] components) {
- this.components = components;
- }
-
+public class CompositeApplicationDefinition implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private String applicationId;
+ private String alias;
+ private ConfigGroup[] components;
+ private ConfigCartridge[] cartridges;
+
+ public ConfigCartridge[] getCartridges() {
+ return cartridges;
+ }
+
+ public void setCartridges(ConfigCartridge[] cartridges) {
+ this.cartridges = cartridges;
+ }
+
+ public String getApplicationId() {
+ return applicationId;
+ }
+
+ public void setApplicationId(String applicationId) {
+ this.applicationId = applicationId;
+ }
+
+ public String getAlias() {
+ return alias;
+ }
+
+ public void setAlias(String alias) {
+ this.alias = alias;
+ }
+
+ public ConfigGroup[] getComponents() {
+ return components;
+ }
+
+ public void setComponents(ConfigGroup[] components) {
+ this.components = components;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigCartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigCartridge.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigCartridge.java
index d69b90b..0d1b7f8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigCartridge.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigCartridge.java
@@ -3,15 +3,15 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class ConfigCartridge implements Serializable {
- private String alias;
- private static final long serialVersionUID = 1L;
+public class ConfigCartridge implements Serializable {
+ private String alias;
+ private static final long serialVersionUID = 1L;
- public String getAlias() {
- return alias;
- }
+ public String getAlias() {
+ return alias;
+ }
- public void setAlias(String alias) {
- this.alias = alias;
- }
+ public void setAlias(String alias) {
+ this.alias = alias;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencies.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencies.java
index e3abad4..e8a7bea 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencies.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencies.java
@@ -3,24 +3,26 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class ConfigDependencies implements Serializable {
- private ConfigDependencyPair[] startup_order;
- private String kill_behavior;
- private static final long serialVersionUID = 1L;
-
- public ConfigDependencyPair[] getStartup_order() {
- return startup_order;
- }
- public void setStartup_order(ConfigDependencyPair[] startup_order) {
- this.startup_order = startup_order;
- }
- public String getKill_behavior() {
- return kill_behavior;
- }
- public void setKill_behavior(String kill_behavior) {
- this.kill_behavior = kill_behavior;
- }
-
-
-
+public class ConfigDependencies implements Serializable {
+ private ConfigDependencyPair[] startup_order;
+ private String kill_behavior;
+ private static final long serialVersionUID = 1L;
+
+ public ConfigDependencyPair[] getStartup_order() {
+ return startup_order;
+ }
+
+ public void setStartup_order(ConfigDependencyPair[] startup_order) {
+ this.startup_order = startup_order;
+ }
+
+ public String getKill_behavior() {
+ return kill_behavior;
+ }
+
+ public void setKill_behavior(String kill_behavior) {
+ this.kill_behavior = kill_behavior;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencyPair.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencyPair.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencyPair.java
index 6a8c1d0..5fa053f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencyPair.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigDependencyPair.java
@@ -2,28 +2,32 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class ConfigDependencyPair implements Serializable {
- private String key;
- private String value;
- private static final long serialVersionUID = 1L;
-
- public ConfigDependencyPair() {}
-
- public ConfigDependencyPair(String key, String value) {
- this.key = key;
- this.value = value;
- }
-
- public String getKey() {
- return key;
- }
- public void setKey(String key) {
- this.key = key;
- }
- public String getValue() {
- return value;
- }
- public void setValue(String value) {
- this.value = value;
- }
+public class ConfigDependencyPair implements Serializable {
+ private String key;
+ private String value;
+ private static final long serialVersionUID = 1L;
+
+ public ConfigDependencyPair() {
+ }
+
+ public ConfigDependencyPair(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigGroup.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigGroup.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigGroup.java
index 3d827f7..cdb5182 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigGroup.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ConfigGroup.java
@@ -3,31 +3,35 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class ConfigGroup implements Serializable {
- private String alias;
- private String[] subscribables;
- private ConfigDependencies dependencies;
- private static final long serialVersionUID = 1L;
-
- public String getAlias() {
- return alias;
- }
- public void setAlias(String alias) {
- this.alias = alias;
- }
- public String[] getSubscribables() {
- return subscribables;
- }
- public void setSubscribables(String[] subscribables) {
- this.subscribables = subscribables;
- }
- public ConfigDependencies getDependencies() {
- return dependencies;
- }
- public void setDependencies(ConfigDependencies dependencies) {
- this.dependencies = dependencies;
- }
-
-
-
+public class ConfigGroup implements Serializable {
+ private String alias;
+ private String[] subscribables;
+ private ConfigDependencies dependencies;
+ private static final long serialVersionUID = 1L;
+
+ public String getAlias() {
+ return alias;
+ }
+
+ public void setAlias(String alias) {
+ this.alias = alias;
+ }
+
+ public String[] getSubscribables() {
+ return subscribables;
+ }
+
+ public void setSubscribables(String[] subscribables) {
+ this.subscribables = subscribables;
+ }
+
+ public ConfigDependencies getDependencies() {
+ return dependencies;
+ }
+
+ public void setDependencies(ConfigDependencies dependencies) {
+ this.dependencies = dependencies;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Container.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Container.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Container.java
index 5cb8708..fec9ff8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Container.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Container.java
@@ -24,36 +24,36 @@ import java.util.Map;
public class Container implements Serializable {
- private static final long serialVersionUID = 2232204459987683768L;
-
- private String imageName;
-
- private String dockerFileRepo;
-
- private Map<String, String> properties = new HashMap<String, String>();
-
- public String getImageName() {
- return imageName;
- }
-
- public void setImageName(String imageName) {
- this.imageName = imageName;
- }
-
- public String getDockerFileRepo() {
- return dockerFileRepo;
- }
-
- public void setDockerFileRepo(String dockerFileRepo) {
- this.dockerFileRepo = dockerFileRepo;
- }
-
- public Map<String, String> getProperties() {
- return properties;
- }
-
- public void setProperties(Map<String, String> properties) {
- this.properties = properties;
- }
-
+ private static final long serialVersionUID = 2232204459987683768L;
+
+ private String imageName;
+
+ private String dockerFileRepo;
+
+ private Map<String, String> properties = new HashMap<String, String>();
+
+ public String getImageName() {
+ return imageName;
+ }
+
+ public void setImageName(String imageName) {
+ this.imageName = imageName;
+ }
+
+ public String getDockerFileRepo() {
+ return dockerFileRepo;
+ }
+
+ public void setDockerFileRepo(String dockerFileRepo) {
+ this.dockerFileRepo = dockerFileRepo;
+ }
+
+ public Map<String, String> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(Map<String, String> properties) {
+ this.properties = properties;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ContainerClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ContainerClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ContainerClusterContext.java
index fa6e33f..7276673 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ContainerClusterContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ContainerClusterContext.java
@@ -24,7 +24,6 @@ import java.io.Serializable;
/**
* Holds information about a container cluster to be started.
- *
*/
public class ContainerClusterContext implements Serializable {
@@ -33,26 +32,28 @@ public class ContainerClusterContext implements Serializable {
private String clusterId;
// partition this member is in.
private Partition partition;
- // instance id - derived from nodeId
+ // instance id - derived from nodeId
private String instanceId;
- //network partition id
+ //network partition id
private String networkPartitionId;
// properties
private Properties properties;
-
+
public ContainerClusterContext() {
}
-
+
public ContainerClusterContext(String clusterId) {
this.clusterId = clusterId;
}
-
+
public String getClusterId() {
return clusterId;
}
+
public void setClusterId(String clusterId) {
this.clusterId = clusterId;
}
+
public Properties getProperties() {
return properties;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
index 735dbdc..5e72c47 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
@@ -26,7 +26,7 @@ import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
*
*
*/
-public class DataPublisherConfig implements Serializable{
+public class DataPublisherConfig implements Serializable {
private static final long serialVersionUID = -2097472019584151205L;
private String bamUsername = CloudControllerConstants.DEFAULT_BAM_SERVER_USER_NAME;
@@ -35,7 +35,7 @@ public class DataPublisherConfig implements Serializable{
private String cassandraConnUrl = CloudControllerConstants.DEFAULT_CASSANDRA_URL;
private String cassandraUser = CloudControllerConstants.DEFAULT_CASSANDRA_USER;
private String cassandraPassword = CloudControllerConstants.DEFAULT_CASSANDRA_PASSWORD;
-
+
public String getBamUsername() {
return bamUsername;
}
@@ -59,6 +59,7 @@ public class DataPublisherConfig implements Serializable{
public void setDataPublisherCron(String dataPublisherCron) {
this.dataPublisherCron = dataPublisherCron;
}
+
public String getCassandraConnUrl() {
return cassandraConnUrl;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
index a04fb91..9299528 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
@@ -24,9 +24,9 @@ import java.util.List;
public class Dependencies implements Serializable {
- private static final long serialVersionUID = 4187267350546153680L;
-
- private String [] startupOrders;
+ private static final long serialVersionUID = 4187267350546153680L;
+
+ private String[] startupOrders;
private String killBehaviour;
@@ -38,11 +38,11 @@ public class Dependencies implements Serializable {
this.killBehaviour = killBehaviour;
}
- public String[] getStartupOrders() {
- return startupOrders;
- }
+ public String[] getStartupOrders() {
+ return startupOrders;
+ }
- public void setStartupOrders(String[] startupOrders) {
- this.startupOrders = startupOrders;
- }
+ public void setStartupOrders(String[] startupOrders) {
+ this.startupOrders = startupOrders;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java
index 8a83733..1d047fe 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java
@@ -21,67 +21,68 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
/**
- * Every {@link NetworkInterface} can have
- * an array of {@link FloatingNetwork}
+ * Every {@link NetworkInterface} can have
+ * an array of {@link FloatingNetwork}
* to which the network interface is associated
+ *
* @author rajkumar
*/
-public class FloatingNetwork implements Serializable{
+public class FloatingNetwork implements Serializable {
+
+ private static final long serialVersionUID = -432127317992004321L;
+ private String name;
+ private String networkUuid;
+ private String floatingIP;
+
+ public FloatingNetwork() {
+ }
+
+ public FloatingNetwork(String name, String networkUuid, String flotingIP) {
+ this.name = name;
+ this.networkUuid = networkUuid;
+ this.floatingIP = flotingIP;
+ }
+
+ public String getName() {
+ return name;
+ }
- private static final long serialVersionUID = -432127317992004321L;
- private String name;
- private String networkUuid;
- private String floatingIP;
-
- public FloatingNetwork() {
- }
-
- public FloatingNetwork(String name, String networkUuid, String flotingIP) {
- this.name = name;
- this.networkUuid = networkUuid;
- this.floatingIP = flotingIP;
- }
-
- public String getName() {
- return name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public String getNetworkUuid() {
+ return networkUuid;
+ }
- public String getNetworkUuid() {
- return networkUuid;
- }
+ public void setNetworkUuid(String networkUuid) {
+ this.networkUuid = networkUuid;
+ }
- public void setNetworkUuid(String networkUuid) {
- this.networkUuid = networkUuid;
- }
-
- public String getFloatingIP() {
- return floatingIP;
- }
+ public String getFloatingIP() {
+ return floatingIP;
+ }
- public void setFloatingIP(String floatingIP) {
- this.floatingIP = floatingIP;
- }
+ public void setFloatingIP(String floatingIP) {
+ this.floatingIP = floatingIP;
+ }
- public String toString() {
- StringBuilder sb = new StringBuilder('{');
- String delimeter = "";
- if (name != null) {
- sb.append(delimeter).append("name : ").append(name);
- delimeter = ", ";
- }
- if (networkUuid != null) {
- sb.append(delimeter).append("networkUuid : ").append(networkUuid);
- delimeter = ", ";
- }
- if (floatingIP != null) {
- sb.append(delimeter).append("floatingIP : ").append(floatingIP);
- delimeter = ", ";
- }
- sb.append('}');
+ public String toString() {
+ StringBuilder sb = new StringBuilder('{');
+ String delimeter = "";
+ if (name != null) {
+ sb.append(delimeter).append("name : ").append(name);
+ delimeter = ", ";
+ }
+ if (networkUuid != null) {
+ sb.append(delimeter).append("networkUuid : ").append(networkUuid);
+ delimeter = ", ";
+ }
+ if (floatingIP != null) {
+ sb.append(delimeter).append("floatingIP : ").append(floatingIP);
+ delimeter = ", ";
+ }
+ sb.append('}');
return sb.toString();
- }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetworks.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetworks.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetworks.java
index 01ecda1..f90113f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetworks.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetworks.java
@@ -23,21 +23,23 @@ import java.util.Arrays;
/**
* Wrapping {@link FloatingNetwork} array
+ *
* @author rajkumar
*/
-public class FloatingNetworks implements Serializable{
-
- private static final long serialVersionUID = -6754884581236402662L;
- private FloatingNetwork[] floatingNetworks;
-
- public FloatingNetwork[] getFloatingNetworks() {
- return floatingNetworks;
- }
- public void setFloatingNetworks(FloatingNetwork[] floatingNetworks) {
- this.floatingNetworks = floatingNetworks;
- }
-
- @Override
+public class FloatingNetworks implements Serializable {
+
+ private static final long serialVersionUID = -6754884581236402662L;
+ private FloatingNetwork[] floatingNetworks;
+
+ public FloatingNetwork[] getFloatingNetworks() {
+ return floatingNetworks;
+ }
+
+ public void setFloatingNetworks(FloatingNetwork[] floatingNetworks) {
+ this.floatingNetworks = floatingNetworks;
+ }
+
+ @Override
public String toString() {
return "FloatingNetworks [FloatingNetworks =" + Arrays.toString(floatingNetworks) + "]";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
index 2efbec9..3db5e63 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
@@ -35,69 +35,69 @@ public class IaasConfig implements Serializable {
private static final long serialVersionUID = 3329046207651171707L;
private String type;
-
+
private String className;
-
+
private String name;
-
+
private String provider, identity, credential;
-
+
private String imageId;
private Properties properties;
-
+
private NetworkInterfaces networkInterfaces;
-
+
private byte[] payload;
public String getClassName() {
return className;
}
-
+
public void setClassName(String className) {
this.className = className;
}
-
+
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
-
+
public String getProvider() {
return provider;
}
-
+
public void setProvider(String provider) {
this.provider = provider;
}
-
+
public String getIdentity() {
return identity;
}
-
+
public void setIdentity(String identity) {
this.identity = identity;
}
-
+
public String getCredential() {
return credential;
}
-
+
public void setCredential(String credential) {
this.credential = credential;
}
-
+
public byte[] getPayload() {
return payload;
}
-
+
public void setPayload(byte[] payload) {
this.payload = ArrayUtils.clone(payload);
}
-
+
public static long getSerialversionuid() {
return serialVersionUID;
}
@@ -126,19 +126,19 @@ public class IaasConfig implements Serializable {
this.properties = properties;
}
- public String toString () {
+ public String toString() {
return " [ Type: " + type + ", Name: " + name + ", Class Name: " + className + ", Image Id: " + imageId +
", Provider: " + provider + ", Identity: " + identity +
", Credentials: " + credential + ", Properties: " + getIaasProperties() + " ] ";
}
- private String getIaasProperties () {
+ private String getIaasProperties() {
StringBuilder iaasPropertyBuilder = new StringBuilder();
if (properties != null) {
Property[] propertyArray = properties.getProperties();
- if(propertyArray.length > 0) {
+ if (propertyArray.length > 0) {
for (Property property : propertyArray) {
iaasPropertyBuilder.append(property.toString() + " | ");
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasProvider.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasProvider.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasProvider.java
index 87d77fc..71c78d1 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasProvider.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasProvider.java
@@ -35,10 +35,10 @@ import java.util.Map;
* NOTE: If you add a new attribute, please assign it in the constructor too.
*/
public class IaasProvider implements Serializable {
-
+
private static final long serialVersionUID = -940288190885166118L;
- /**
+ /**
* Type of the IaasProvider.
*/
private String type;
@@ -48,64 +48,65 @@ public class IaasProvider implements Serializable {
* Fully qualified class name of an implementation of {@link org.apache.stratos.cloud.controller.iaases.Iaas}
*/
private String className;
-
+
/**
* human description of this IaaS provider
*/
private String name;
-
+
/**
* Property map of this IaaS provider.
*/
private Map<String, String> properties = new HashMap<String, String>();
-
+
/**
* Network Interfaces Configuration
*/
private NetworkInterface[] networkInterfaces;
-
+
/**
* Image identifier.
*/
private String image;
-
+
private String provider, identity, credential;
-
+
private transient ComputeService computeService;
-
+
private transient Template template;
-
+
private byte[] payload;
-
- /**
+
+ /**
* Corresponding {@link org.apache.stratos.cloud.controller.iaases.Iaas} implementation
*/
private transient Iaas iaas;
-
- public IaasProvider(){}
-
- public IaasProvider(IaasProvider anIaasProvider){
- this.type = anIaasProvider.getType();
- this.name = anIaasProvider.getName();
- this.className = anIaasProvider.getClassName();
- this.computeService = anIaasProvider.getComputeService();
- this.properties = new HashMap<String,String>(anIaasProvider.getProperties());
- this.networkInterfaces = anIaasProvider.getNetworkInterfaces();
- this.image = anIaasProvider.getImage();
- this.provider = anIaasProvider.getProvider();
- this.identity = anIaasProvider.getIdentity();
- this.credential = anIaasProvider.getCredential();
- this.payload = anIaasProvider.getPayload();
- }
-
+
+ public IaasProvider() {
+ }
+
+ public IaasProvider(IaasProvider anIaasProvider) {
+ this.type = anIaasProvider.getType();
+ this.name = anIaasProvider.getName();
+ this.className = anIaasProvider.getClassName();
+ this.computeService = anIaasProvider.getComputeService();
+ this.properties = new HashMap<String, String>(anIaasProvider.getProperties());
+ this.networkInterfaces = anIaasProvider.getNetworkInterfaces();
+ this.image = anIaasProvider.getImage();
+ this.provider = anIaasProvider.getProvider();
+ this.identity = anIaasProvider.getIdentity();
+ this.credential = anIaasProvider.getCredential();
+ this.payload = anIaasProvider.getPayload();
+ }
+
public String getType() {
return type;
}
-
+
public void setType(String id) {
this.type = id;
}
-
+
public String getProperty(String key) {
return properties.get(key);
}
@@ -113,16 +114,16 @@ public class IaasProvider implements Serializable {
public Map<String, String> getProperties() {
return properties;
}
-
+
public void addProperty(String key, String val) {
if (key != null && val != null) {
properties.put(key, val);
}
}
-
+
public void setProperty(String key, String value) {
-
- if(key != null && value != null){
+
+ if (key != null && value != null) {
properties.put(key, value);
}
}
@@ -186,26 +187,25 @@ public class IaasProvider implements Serializable {
public void setTemplate(Template template) {
this.template = template;
}
-
-
+
public boolean equals(Object o) {
- if(o instanceof IaasProvider){
+ if (o instanceof IaasProvider) {
return ((IaasProvider) o).getType().equals(this.getType());
}
-
+
return false;
}
-
+
public int hashCode() {
return new HashCodeBuilder(17, 31). // two randomly chosen prime numbers
- append(type).
- toHashCode();
+ append(type).
+ toHashCode();
+ }
+
+ public IaasProvider copy() {
+ return new IaasProvider(this);
}
-
- public IaasProvider copy(){
- return new IaasProvider(this);
- }
public String getClassName() {
return className;
@@ -216,9 +216,9 @@ public class IaasProvider implements Serializable {
}
public Iaas getIaas() {
- if (iaas == null) {
+ if (iaas == null) {
synchronized (IaasProvider.this) {
- if(iaas == null) {
+ if (iaas == null) {
try {
iaas = CloudControllerUtil.createIaasInstance(this);
iaas.initialize();
@@ -227,11 +227,11 @@ public class IaasProvider implements Serializable {
}
}
}
- }
+ }
return iaas;
}
-
- public void reset(){
+
+ public void reset() {
// nodeIds = new ArrayList<String>();
// nodes = new HashMap<String, NodeMetadata>();
// toBeRemovedNodeIds = new ArrayList<String>();
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/LoadbalancerConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/LoadbalancerConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/LoadbalancerConfig.java
index 1e780cf..3165918 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/LoadbalancerConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/LoadbalancerConfig.java
@@ -33,9 +33,9 @@ public class LoadbalancerConfig implements Serializable {
private static final long serialVersionUID = 289225330995632449L;
private String type;
-
+
private Properties properties;
-
+
public String getType() {
return type;
}
@@ -52,17 +52,17 @@ public class LoadbalancerConfig implements Serializable {
this.properties = properties;
}
- public String toString () {
+ public String toString() {
return " [ Type: " + type + ", Properties: " + getIaasProperties() + " ] ";
}
- private String getIaasProperties () {
+ private String getIaasProperties() {
StringBuilder iaasPropertyBuilder = new StringBuilder();
if (properties != null) {
Property[] propertyArray = properties.getProperties();
- if(propertyArray.length > 0) {
+ if (propertyArray.length > 0) {
for (Property property : propertyArray) {
iaasPropertyBuilder.append(property.toString() + " | ");
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java
index 2388e99..ebe2940 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java
@@ -28,7 +28,6 @@ import java.util.Arrays;
/**
* Holds information about a Member.
- *
*/
public class MemberContext implements Serializable {
@@ -91,7 +90,7 @@ public class MemberContext implements Serializable {
public String getApplicationId() {
return applicationId;
}
-
+
public String getMemberId() {
return memberId;
}
@@ -119,7 +118,7 @@ public class MemberContext implements Serializable {
public void setDefaultPublicIP(String defaultPublicIP) {
this.defaultPublicIP = defaultPublicIP;
}
-
+
public String[] getPublicIPs() {
return publicIPs;
}
@@ -135,7 +134,7 @@ public class MemberContext implements Serializable {
public void setDefaultPrivateIP(String defaultPrivateIP) {
this.defaultPrivateIP = defaultPrivateIP;
}
-
+
public String[] getPrivateIPs() {
return privateIPs;
}
@@ -176,45 +175,45 @@ public class MemberContext implements Serializable {
this.networkPartitionId = networkPartitionId;
}
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result
- + ((clusterId == null) ? 0 : clusterId.hashCode());
- result = prime * result
- + ((memberId == null) ? 0 : memberId.hashCode());
- result = prime * result + ((instanceId == null) ? 0 : instanceId.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result
+ + ((clusterId == null) ? 0 : clusterId.hashCode());
+ result = prime * result
+ + ((memberId == null) ? 0 : memberId.hashCode());
+ result = prime * result + ((instanceId == null) ? 0 : instanceId.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
MemberContext other = (MemberContext) obj;
- if(getApplicationId().equals(other.getApplicationId()) &&
+ if (getApplicationId().equals(other.getApplicationId()) &&
getCartridgeType().equals(other.getCartridgeType()) &&
getClusterId().equals(other.getClusterId()) &&
getMemberId().equals(other.getMemberId()) &&
getInstanceId().equals(other.getInstanceId())) {
return true;
}
- return false;
- }
+ return false;
+ }
- public String getInstanceId() {
- return instanceId;
- }
+ public String getInstanceId() {
+ return instanceId;
+ }
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ }
public long getObsoleteExpiryTime() {
return obsoleteExpiryTime;
[4/6] stratos git commit: Formatting cloud controller code
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkInterface.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkInterface.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkInterface.java
index 7c1fea1..884b78d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkInterface.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkInterface.java
@@ -22,91 +22,96 @@ import java.io.Serializable;
public class NetworkInterface implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = 3979879787250775211L;
- private String networkUuid;
- private String fixedIp;
- private String portUuid;
- private FloatingNetworks floatingNetworks;
-
- public NetworkInterface() {
- }
-
- public NetworkInterface(String networkUuid, String fixedIp, String portUuid) {
- this.networkUuid = networkUuid;
- this.fixedIp = fixedIp;
- this.portUuid = portUuid;
- }
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3979879787250775211L;
+ private String networkUuid;
+ private String fixedIp;
+ private String portUuid;
+ private FloatingNetworks floatingNetworks;
- /**
- * @return the networkUuid
- */
- public String getNetworkUuid() {
- return networkUuid;
- }
- /**
- * @param networkUuid the networkUuid to set
- */
- public void setNetworkUuid(String networkUuid) {
- this.networkUuid = networkUuid;
- }
- /**
- * @return the fixedIp
- */
- public String getFixedIp() {
- return fixedIp;
- }
- /**
- * @param fixedIp the fixedIp to set
- */
- public void setFixedIp(String fixedIp) {
- this.fixedIp = fixedIp;
- }
- /**
- * @return the portUuid
- */
- public String getPortUuid() {
- return portUuid;
- }
- /**
- * @param portUuid the portUuid to set
- */
- public void setPortUuid(String portUuid) {
- this.portUuid = portUuid;
- }
-
- /**
- * @return {@link FloatingNetworks}
- */
- public FloatingNetworks getFloatingNetworks() {
- return floatingNetworks;
- }
-
- /**
- * @param floatingNetworks the {@link FloatingNetworks} to be set
- */
- public void setFloatingNetworks(FloatingNetworks floatingNetworks) {
- this.floatingNetworks = floatingNetworks;
- }
-
- public String toString() {
- StringBuilder sb = new StringBuilder('{');
- String delimeter = "";
- if (networkUuid != null) {
- sb.append(delimeter).append("networkUuid : ").append(networkUuid);
- delimeter = ", ";
- }
- if (fixedIp != null) {
- sb.append(delimeter).append("fixedIp : ").append(fixedIp);
- delimeter = ", ";
- }
- if (portUuid != null) {
- sb.append(delimeter).append("portUuid : ").append(portUuid);
- delimeter = ", ";
- }
- sb.append('}');
+ public NetworkInterface() {
+ }
+
+ public NetworkInterface(String networkUuid, String fixedIp, String portUuid) {
+ this.networkUuid = networkUuid;
+ this.fixedIp = fixedIp;
+ this.portUuid = portUuid;
+ }
+
+ /**
+ * @return the networkUuid
+ */
+ public String getNetworkUuid() {
+ return networkUuid;
+ }
+
+ /**
+ * @param networkUuid the networkUuid to set
+ */
+ public void setNetworkUuid(String networkUuid) {
+ this.networkUuid = networkUuid;
+ }
+
+ /**
+ * @return the fixedIp
+ */
+ public String getFixedIp() {
+ return fixedIp;
+ }
+
+ /**
+ * @param fixedIp the fixedIp to set
+ */
+ public void setFixedIp(String fixedIp) {
+ this.fixedIp = fixedIp;
+ }
+
+ /**
+ * @return the portUuid
+ */
+ public String getPortUuid() {
+ return portUuid;
+ }
+
+ /**
+ * @param portUuid the portUuid to set
+ */
+ public void setPortUuid(String portUuid) {
+ this.portUuid = portUuid;
+ }
+
+ /**
+ * @return {@link FloatingNetworks}
+ */
+ public FloatingNetworks getFloatingNetworks() {
+ return floatingNetworks;
+ }
+
+ /**
+ * @param floatingNetworks the {@link FloatingNetworks} to be set
+ */
+ public void setFloatingNetworks(FloatingNetworks floatingNetworks) {
+ this.floatingNetworks = floatingNetworks;
+ }
+
+ public String toString() {
+ StringBuilder sb = new StringBuilder('{');
+ String delimeter = "";
+ if (networkUuid != null) {
+ sb.append(delimeter).append("networkUuid : ").append(networkUuid);
+ delimeter = ", ";
+ }
+ if (fixedIp != null) {
+ sb.append(delimeter).append("fixedIp : ").append(fixedIp);
+ delimeter = ", ";
+ }
+ if (portUuid != null) {
+ sb.append(delimeter).append("portUuid : ").append(portUuid);
+ delimeter = ", ";
+ }
+ sb.append('}');
return sb.toString();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkInterfaces.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkInterfaces.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkInterfaces.java
index 1c0b447..c67d20d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkInterfaces.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkInterfaces.java
@@ -20,35 +20,35 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
import java.util.Arrays;
+
/**
- * Had to wrap {@link NetworkInterface} array using a class, since there's a bug in current
+ * Had to wrap {@link NetworkInterface} array using a class, since there's a bug in current
* stub generation.
- *
*/
public class NetworkInterfaces implements Serializable {
- private static final long serialVersionUID = -8435710709813227055L;
- private NetworkInterface[] networkInterfaces;
+ private static final long serialVersionUID = -8435710709813227055L;
+ private NetworkInterface[] networkInterfaces;
- /**
- * @return the networkInterfaces
- */
- public NetworkInterface[] getNetworkInterfaces() {
- return networkInterfaces;
- }
+ /**
+ * @return the networkInterfaces
+ */
+ public NetworkInterface[] getNetworkInterfaces() {
+ return networkInterfaces;
+ }
- /**
- * @param networkInterfaces the networkInterfaces to set
- */
- public void setNetworkInterfaces(NetworkInterface[] networkInterfaces) {
- if(networkInterfaces == null) {
+ /**
+ * @param networkInterfaces the networkInterfaces to set
+ */
+ public void setNetworkInterfaces(NetworkInterface[] networkInterfaces) {
+ if (networkInterfaces == null) {
this.networkInterfaces = new NetworkInterface[0];
} else {
this.networkInterfaces = Arrays.copyOf(networkInterfaces, networkInterfaces.length);
}
- }
+ }
- @Override
+ @Override
public String toString() {
return "NetworkInterfaces [network interfaces=" + Arrays.toString(networkInterfaces) + "]";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java
index 54be9b0..d2ddbb4 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java
@@ -23,8 +23,8 @@ import java.io.Serializable;
import java.util.Arrays;
/**
-* The model class for NetworkPartition definition.
-*/
+ * The model class for NetworkPartition definition.
+ */
public class NetworkPartition implements Serializable {
private static final long serialVersionUID = -8043298009352097370L;
@@ -36,7 +36,7 @@ public class NetworkPartition implements Serializable {
private String partitionAlgo;
public void setPartitions(Partition[] partitions) {
- if(partitions == null) {
+ if (partitions == null) {
this.partitions = partitions;
} else {
this.partitions = Arrays.copyOf(partitions, partitions.length);
@@ -52,7 +52,7 @@ public class NetworkPartition implements Serializable {
}
return this.partitions;
}
-
+
/**
* Gets the value of the id.
*/
@@ -76,21 +76,21 @@ public class NetworkPartition implements Serializable {
}
public Partition getPartition(String partitionId) {
- for(Partition partition : partitions) {
- if(partition.getId().equals(partitionId)) {
+ for (Partition partition : partitions) {
+ if (partition.getId().equals(partitionId)) {
return partition;
}
}
return null;
}
- public String getProvider() {
- return provider;
- }
+ public String getProvider() {
+ return provider;
+ }
- public void setProvider(String provider) {
- this.provider = provider;
- }
+ public void setProvider(String provider) {
+ this.provider = provider;
+ }
public String getPartitionAlgo() {
return partitionAlgo;
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
index 4625a35..991d305 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
@@ -45,10 +45,8 @@ public class Partition implements Serializable {
/**
* Gets the value of the id property.
*
- * @return
- * possible object is
- * {@link String }
- *
+ * @return possible object is
+ * {@link String }
*/
public String getId() {
return id;
@@ -57,10 +55,8 @@ public class Partition implements Serializable {
/**
* Sets the value of the id property.
*
- * @param id
- * allowed object is
- * {@link String }
- *
+ * @param id allowed object is
+ * {@link String }
*/
public void setId(String id) {
this.id = id;
@@ -69,10 +65,8 @@ public class Partition implements Serializable {
/**
* Gets the value of the description property.
*
- * @return
- * possible object is
- * {@link String }
- *
+ * @return possible object is
+ * {@link String }
*/
public String getDescription() {
return description;
@@ -81,10 +75,8 @@ public class Partition implements Serializable {
/**
* Sets the value of the description property.
*
- * @param description
- * allowed object is
- * {@link String }
- *
+ * @param description allowed object is
+ * {@link String }
*/
public void setDescription(String description) {
this.description = description;
@@ -93,9 +85,7 @@ public class Partition implements Serializable {
/**
* Sets the value of the isPublic property.
*
- * @param isPublic
- * allowed object is boolean
- *
+ * @param isPublic allowed object is boolean
*/
public void setIsPublic(boolean isPublic) {
this.isPublic = isPublic;
@@ -103,7 +93,6 @@ public class Partition implements Serializable {
/**
* Gets the value of the isPublic property.
- *
*/
public boolean getIsPublic() {
return isPublic;
@@ -127,7 +116,7 @@ public class Partition implements Serializable {
public String getKubernetesClusterId() {
Property property = properties.getProperty(KUBERNETES_CLUSTER);
- if(property != null) {
+ if (property != null) {
return property.getValue();
}
return null;
@@ -140,7 +129,7 @@ public class Partition implements Serializable {
}
public boolean equals(Object obj) {
- if(obj != null && obj instanceof Partition) {
+ if (obj != null && obj instanceof Partition) {
return this.id.equals(((Partition) obj).getId());
}
return false;
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java
index 8361734..d99145b 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/PortMapping.java
@@ -20,67 +20,67 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-public class PortMapping implements Serializable{
-
+public class PortMapping implements Serializable {
+
private static final long serialVersionUID = -5387564414633460306L;
- private String protocol;
- private int port;
- private int proxyPort;
- private int kubernetesServicePort;
- private boolean isKubernetesServicePortMapping;
-
- public PortMapping() {
- }
-
- public PortMapping(String protocol, int port, int proxyPort){
- this.protocol = protocol;
- this.port = port;
- this.proxyPort = proxyPort;
- }
-
- public String getProtocol() {
- return protocol;
+ private String protocol;
+ private int port;
+ private int proxyPort;
+ private int kubernetesServicePort;
+ private boolean isKubernetesServicePortMapping;
+
+ public PortMapping() {
+ }
+
+ public PortMapping(String protocol, int port, int proxyPort) {
+ this.protocol = protocol;
+ this.port = port;
+ this.proxyPort = proxyPort;
+ }
+
+ public String getProtocol() {
+ return protocol;
}
- public void setProtocol(String protocol) {
- this.protocol = protocol;
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
}
- public int getPort() {
- return port;
+ public int getPort() {
+ return port;
}
- public void setPort(int port) {
- this.port = port;
+ public void setPort(int port) {
+ this.port = port;
}
- public int getProxyPort() {
- return proxyPort;
+ public int getProxyPort() {
+ return proxyPort;
}
- public void setProxyPort(int proxyPort) {
- this.proxyPort = proxyPort;
+ public void setProxyPort(int proxyPort) {
+ this.proxyPort = proxyPort;
}
- public String toString () {
+ public String toString() {
return "Protocol: " + protocol + ", Port: " + port + ", Proxy Port: " + proxyPort;
}
- public void setKubernetesServicePort(int kubernetesServicePort) {
- this.kubernetesServicePort = kubernetesServicePort;
- }
+ public void setKubernetesServicePort(int kubernetesServicePort) {
+ this.kubernetesServicePort = kubernetesServicePort;
+ }
- public int getKubernetesServicePort() {
- return kubernetesServicePort;
- }
+ public int getKubernetesServicePort() {
+ return kubernetesServicePort;
+ }
- public boolean isKubernetesServicePortMapping() {
- return isKubernetesServicePortMapping;
- }
+ public boolean isKubernetesServicePortMapping() {
+ return isKubernetesServicePortMapping;
+ }
- public void setKubernetesServicePortMapping(boolean isKubernetesServicePortMapping) {
- this.isKubernetesServicePortMapping = isKubernetesServicePortMapping;
- }
+ public void setKubernetesServicePortMapping(boolean isKubernetesServicePortMapping) {
+ this.isKubernetesServicePortMapping = isKubernetesServicePortMapping;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Registrant.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Registrant.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Registrant.java
index a751a1f..82de85d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Registrant.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Registrant.java
@@ -22,8 +22,6 @@ import org.apache.stratos.common.Properties;
/**
* Upon a new subscription, Stratos Manager would send this POJO.
- *
- *
*/
public class Registrant {
@@ -36,46 +34,59 @@ public class Registrant {
private String autoScalerPolicyName;
private String deploymentPolicyName;
private Persistence persistence;
-
+
public String getTenantRange() {
return tenantRange;
}
+
public void setTenantRange(String tenantRange) {
this.tenantRange = tenantRange;
}
+
public String getHostName() {
return hostName;
}
+
public void setHostName(String hostName) {
this.hostName = hostName;
}
+
public Properties getProperties() {
return properties;
}
+
public void setProperties(Properties properties) {
this.properties = properties;
}
+
public String getAutoScalerPolicyName() {
return autoScalerPolicyName;
}
+
public void setAutoScalerPolicyName(String autoScalerPolicyName) {
this.autoScalerPolicyName = autoScalerPolicyName;
}
+
public String getClusterId() {
return clusterId;
}
+
public void setClusterId(String clusterId) {
this.clusterId = clusterId;
}
+
public String getCartridgeType() {
return cartridgeType;
}
+
public void setCartridgeType(String cartridgeType) {
this.cartridgeType = cartridgeType;
}
+
public String getPayload() {
return payload;
}
+
public void setPayload(String payload) {
this.payload = payload;
}
@@ -87,12 +98,13 @@ public class Registrant {
public void setDeploymentPolicyName(String deploymentPolicyName) {
this.deploymentPolicyName = deploymentPolicyName;
}
+
@Override
public String toString() {
return "Registrant [clusterId=" + clusterId + ", tenantRange=" + tenantRange +
- ", hostName=" + hostName + ", cartridgeType=" + cartridgeType + ", properties=" +
- properties + ", autoScalerPolicyName=" + autoScalerPolicyName +
- ", deploymentPolicyName=" + deploymentPolicyName + "]";
+ ", hostName=" + hostName + ", cartridgeType=" + cartridgeType + ", properties=" +
+ properties + ", autoScalerPolicyName=" + autoScalerPolicyName +
+ ", deploymentPolicyName=" + deploymentPolicyName + "]";
}
public Persistence getPersistence() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ServiceGroup.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ServiceGroup.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ServiceGroup.java
index a7fec55..3f3260a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ServiceGroup.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ServiceGroup.java
@@ -23,11 +23,11 @@ import java.io.Serializable;
public class ServiceGroup implements Serializable {
- private static final long serialVersionUID = -7413745300105885793L;
+ private static final long serialVersionUID = -7413745300105885793L;
- private String name;
- private String [] subGroups;
- private String [] cartridges;
+ private String name;
+ private String[] subGroups;
+ private String[] cartridges;
private Dependencies dependencies;
public String getName() {
@@ -38,19 +38,19 @@ public class ServiceGroup implements Serializable {
this.name = name;
}
- public String [] getSubGroups() {
+ public String[] getSubGroups() {
return subGroups;
}
- public void setSubGroups(String [] subGroups) {
+ public void setSubGroups(String[] subGroups) {
this.subGroups = subGroups;
}
- public String [] getCartridges() {
+ public String[] getCartridges() {
return cartridges;
}
- public void setCartridges(String [] cartridges) {
+ public void setCartridges(String[] cartridges) {
this.cartridges = cartridges;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/TopologyConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/TopologyConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/TopologyConfig.java
index 4d88de6..0cc671e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/TopologyConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/TopologyConfig.java
@@ -24,27 +24,26 @@ import java.util.Map;
/**
* Configuration related to Topology synchronization
- *
*/
-public class TopologyConfig implements Serializable{
-
- private static final long serialVersionUID = 4435173744617096911L;
-
- /**
+public class TopologyConfig implements Serializable {
+
+ private static final long serialVersionUID = 4435173744617096911L;
+
+ /**
* Key - Value pair.
*/
private Map<String, String> properties = new HashMap<String, String>();
-
+
public void setProperty(String key, String value) {
properties.put(key, value);
}
-
+
public String getProperty(String key) {
-
- if(properties.containsKey(key)){
+
+ if (properties.containsKey(key)) {
return properties.get(key);
}
-
+
return null;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Volume.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Volume.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Volume.java
index 8173583..d122e38 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Volume.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Volume.java
@@ -25,14 +25,14 @@ public class Volume implements Serializable {
private String id;
private int size;
- private String device;
- private boolean removeOntermination;
+ private String device;
+ private boolean removeOntermination;
private String mappingPath;
private String iaasType;
private String snapshotId;
private String volumeId;
- public String toString () {
+ public String toString() {
return "Persistence Required: " + ", Size: " + getSize() + ", device: " + getDevice() +
" mapping path : " + mappingPath + " remove on termination " + isRemoveOntermination() + " SnaphotId " + snapshotId;
}
@@ -53,7 +53,9 @@ public class Volume implements Serializable {
this.device = device;
}
- public boolean isRemoveOntermination() {return removeOntermination;}
+ public boolean isRemoveOntermination() {
+ return removeOntermination;
+ }
public void setRemoveOntermination(boolean removeOntermination) {
this.removeOntermination = removeOntermination;
@@ -67,54 +69,54 @@ public class Volume implements Serializable {
this.mappingPath = mappingPath;
}
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((id == null) ? 0 : id.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Volume other = (Volume) obj;
- if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- return true;
- }
-
- public String getIaasType() {
- return iaasType;
- }
-
- public void setIaasType(String iaasType) {
- this.iaasType = iaasType;
- }
-
- public String getSnapshotId() {
- return snapshotId;
- }
-
- public void setSnapshotId(String snapshotId) {
- this.snapshotId = snapshotId;
- }
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Volume other = (Volume) obj;
+ if (id == null) {
+ if (other.id != null)
+ return false;
+ } else if (!id.equals(other.id))
+ return false;
+ return true;
+ }
+
+ public String getIaasType() {
+ return iaasType;
+ }
+
+ public void setIaasType(String iaasType) {
+ this.iaasType = iaasType;
+ }
+
+ public String getSnapshotId() {
+ return snapshotId;
+ }
+
+ public void setSnapshotId(String snapshotId) {
+ this.snapshotId = snapshotId;
+ }
public String getVolumeId() {
return volumeId;
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesCluster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesCluster.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesCluster.java
index 1394cf6..8730a61 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesCluster.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesCluster.java
@@ -51,7 +51,7 @@ public class KubernetesCluster implements Serializable {
}
public void setKubernetesHosts(KubernetesHost[] kubernetesHosts) {
- if(kubernetesHosts == null) {
+ if (kubernetesHosts == null) {
this.kubernetesHosts = new KubernetesHost[0];
} else {
this.kubernetesHosts = Arrays.copyOf(kubernetesHosts, kubernetesHosts.length);
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java
index 2a8bc23..38c49a0 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java
@@ -29,15 +29,13 @@ import java.util.concurrent.atomic.AtomicLong;
/**
* Holds information about a Kubernetes Cluster.
- *
- *
*/
public class KubernetesClusterContext implements Serializable {
- private static final long serialVersionUID = -802025758806195791L;
- private static final Log log = LogFactory.getLog(KubernetesClusterContext.class);
-
- // id of the Kubernetes cluster
+ private static final long serialVersionUID = -802025758806195791L;
+ private static final Log log = LogFactory.getLog(KubernetesClusterContext.class);
+
+ // id of the Kubernetes cluster
private String kubernetesClusterId;
private int upperPort;
private int lowerPort;
@@ -52,80 +50,80 @@ public class KubernetesClusterContext implements Serializable {
private AtomicLong podSeqNo;
public KubernetesClusterContext(String id, String masterIp, String masterPort, int lowerPort, int upperPort) {
- servicePorts = new ArrayList<Integer>();
+ servicePorts = new ArrayList<Integer>();
this.lowerPort = lowerPort;
- this.upperPort = upperPort;
- // Generate the ports
+ this.upperPort = upperPort;
+ // Generate the ports
generateServicePorts(lowerPort, upperPort);
- this.kubernetesClusterId = id;
- this.masterIp = masterIp;
- this.masterPort = masterPort;
- this.setKubApi(new KubernetesApiClient(getEndpoint(masterIp, masterPort)));
+ this.kubernetesClusterId = id;
+ this.masterIp = masterIp;
+ this.masterPort = masterPort;
+ this.setKubApi(new KubernetesApiClient(getEndpoint(masterIp, masterPort)));
this.serviceSeqNo = new AtomicLong();
this.podSeqNo = new AtomicLong();
-
- }
-
- private String getEndpoint(String ip, String port) {
- return "http://"+ip+":"+port+"/api/v1beta1/";
- }
-
- public String getKubernetesClusterId() {
- return kubernetesClusterId;
- }
-
- public void setKubernetesClusterId(String kubernetesClusterId) {
- this.kubernetesClusterId = kubernetesClusterId;
- }
-
- public List<Integer> getServicePorts() {
- return servicePorts;
- }
-
- public void setServicePorts(List<Integer> servicePorts) {
- this.servicePorts = servicePorts;
- }
-
- public int getNextServicePort() {
- if (servicePorts.isEmpty()) {
- return -1;
- }
- return servicePorts.remove(0);
- }
-
- public void deallocatePort(int port) {
- if (!servicePorts.contains(port)) {
- servicePorts.add(port);
+
+ }
+
+ private String getEndpoint(String ip, String port) {
+ return "http://" + ip + ":" + port + "/api/v1beta1/";
+ }
+
+ public String getKubernetesClusterId() {
+ return kubernetesClusterId;
+ }
+
+ public void setKubernetesClusterId(String kubernetesClusterId) {
+ this.kubernetesClusterId = kubernetesClusterId;
+ }
+
+ public List<Integer> getServicePorts() {
+ return servicePorts;
+ }
+
+ public void setServicePorts(List<Integer> servicePorts) {
+ this.servicePorts = servicePorts;
+ }
+
+ public int getNextServicePort() {
+ if (servicePorts.isEmpty()) {
+ return -1;
+ }
+ return servicePorts.remove(0);
+ }
+
+ public void deallocatePort(int port) {
+ if (!servicePorts.contains(port)) {
+ servicePorts.add(port);
// TODO Sort elements
- }
- }
-
- private void generateServicePorts(int lowerPort, int upperPort) {
- for (int port = lowerPort; port <= upperPort; port++) {
- servicePorts.add(port);
- }
- }
-
- public String getMasterIp() {
- return masterIp;
- }
-
- public void setMasterIp(String masterIp) {
- this.masterIp = masterIp;
- }
-
- public KubernetesApiClient getKubApi() {
- if (kubApi == null) {
- kubApi = new KubernetesApiClient(getEndpoint(masterIp, masterPort));
- }
- return kubApi;
- }
-
- public void setKubApi(KubernetesApiClient kubApi) {
- this.kubApi = kubApi;
- }
-
- public int getUpperPort() {
+ }
+ }
+
+ private void generateServicePorts(int lowerPort, int upperPort) {
+ for (int port = lowerPort; port <= upperPort; port++) {
+ servicePorts.add(port);
+ }
+ }
+
+ public String getMasterIp() {
+ return masterIp;
+ }
+
+ public void setMasterIp(String masterIp) {
+ this.masterIp = masterIp;
+ }
+
+ public KubernetesApiClient getKubApi() {
+ if (kubApi == null) {
+ kubApi = new KubernetesApiClient(getEndpoint(masterIp, masterPort));
+ }
+ return kubApi;
+ }
+
+ public void setKubApi(KubernetesApiClient kubApi) {
+ this.kubApi = kubApi;
+ }
+
+ public int getUpperPort() {
return upperPort;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ApplicationClusterRegistrationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ApplicationClusterRegistrationException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ApplicationClusterRegistrationException.java
index af2a383..100b3ac 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ApplicationClusterRegistrationException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ApplicationClusterRegistrationException.java
@@ -23,21 +23,21 @@ public class ApplicationClusterRegistrationException extends Exception {
private String message;
- public ApplicationClusterRegistrationException () {
+ public ApplicationClusterRegistrationException() {
super();
}
- public ApplicationClusterRegistrationException (String message, Throwable cause) {
+ public ApplicationClusterRegistrationException(String message, Throwable cause) {
super(message, cause);
this.message = message;
}
- public ApplicationClusterRegistrationException (String message) {
+ public ApplicationClusterRegistrationException(String message) {
super(message);
this.message = message;
}
- public ApplicationClusterRegistrationException (Throwable cause) {
+ public ApplicationClusterRegistrationException(Throwable cause) {
super(cause);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ApplicationDefinitionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ApplicationDefinitionException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ApplicationDefinitionException.java
index a1a9581..02e726f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ApplicationDefinitionException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ApplicationDefinitionException.java
@@ -23,21 +23,21 @@ public class ApplicationDefinitionException extends Exception {
private String message;
- public ApplicationDefinitionException () {
+ public ApplicationDefinitionException() {
super();
}
- public ApplicationDefinitionException (String message, Throwable cause) {
+ public ApplicationDefinitionException(String message, Throwable cause) {
super(message, cause);
this.message = message;
}
- public ApplicationDefinitionException (String message) {
+ public ApplicationDefinitionException(String message) {
super(message);
this.message = message;
}
- public ApplicationDefinitionException (Throwable cause) {
+ public ApplicationDefinitionException(Throwable cause) {
super(cause);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CartridgeDefinitionNotExistsException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CartridgeDefinitionNotExistsException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CartridgeDefinitionNotExistsException.java
index c16e15a..ab78cd8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CartridgeDefinitionNotExistsException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CartridgeDefinitionNotExistsException.java
@@ -33,12 +33,12 @@ public class CartridgeDefinitionNotExistsException extends Exception {
this.setMessage(msg);
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CartridgeNotFoundException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CartridgeNotFoundException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CartridgeNotFoundException.java
index 899b21f..b790b30 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CartridgeNotFoundException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CartridgeNotFoundException.java
@@ -19,25 +19,25 @@
package org.apache.stratos.cloud.controller.exception;
public class CartridgeNotFoundException extends Exception {
-
+
private static final long serialVersionUID = -6326227079367867222L;
- private String message;
+ private String message;
public CartridgeNotFoundException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public CartridgeNotFoundException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
-
+
private void setMessage(String msg) {
- this.message = msg;
- }
+ this.message = msg;
+ }
- public String getMessage() {
+ public String getMessage() {
return this.message;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CloudControllerException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CloudControllerException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CloudControllerException.java
index ce38b01..b3d3c4b 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CloudControllerException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/CloudControllerException.java
@@ -19,13 +19,13 @@
package org.apache.stratos.cloud.controller.exception;
public class CloudControllerException extends RuntimeException {
-
+
private static final long serialVersionUID = -6326227079367867222L;
public CloudControllerException(String msg) {
super(msg);
}
-
+
public CloudControllerException(String msg, Exception ex) {
super(msg, ex);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ClusterInstanceCreationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ClusterInstanceCreationException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ClusterInstanceCreationException.java
index db290d9..7942386 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ClusterInstanceCreationException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/ClusterInstanceCreationException.java
@@ -23,21 +23,21 @@ public class ClusterInstanceCreationException extends Exception {
private String message;
- public ClusterInstanceCreationException () {
+ public ClusterInstanceCreationException() {
super();
}
- public ClusterInstanceCreationException (String message, Throwable cause) {
+ public ClusterInstanceCreationException(String message, Throwable cause) {
super(message, cause);
this.message = message;
}
- public ClusterInstanceCreationException (String message) {
+ public ClusterInstanceCreationException(String message) {
super(message);
this.message = message;
}
- public ClusterInstanceCreationException (Throwable cause) {
+ public ClusterInstanceCreationException(Throwable cause) {
super(cause);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/DeserializationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/DeserializationException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/DeserializationException.java
index ce2305c..9d7d5e6 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/DeserializationException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/DeserializationException.java
@@ -19,13 +19,13 @@
package org.apache.stratos.cloud.controller.exception;
public class DeserializationException extends RuntimeException {
-
+
private static final long serialVersionUID = -2426068347954381831L;
public DeserializationException(String msg) {
super(msg);
}
-
+
public DeserializationException(String msg, Exception ex) {
super(msg, ex);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeDefinitionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeDefinitionException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeDefinitionException.java
index 148e55e..ca252fc 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeDefinitionException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeDefinitionException.java
@@ -19,26 +19,26 @@
package org.apache.stratos.cloud.controller.exception;
public class InvalidCartridgeDefinitionException extends Exception {
-
+
private static final long serialVersionUID = -6326227079367867222L;
private String message;
-
+
public InvalidCartridgeDefinitionException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidCartridgeDefinitionException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeTypeException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeTypeException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeTypeException.java
index 6f308f9..60341fe 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeTypeException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeTypeException.java
@@ -21,29 +21,27 @@ package org.apache.stratos.cloud.controller.exception;
/**
* Throws when a {@link Partition} is evaluated to be invalid.
- *
- *
*/
public class InvalidCartridgeTypeException extends Exception {
private static final long serialVersionUID = 8060893118810908075L;
private String message;
-
+
public InvalidCartridgeTypeException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidCartridgeTypeException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidClusterException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidClusterException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidClusterException.java
index 4a1ab9e..54ec8ab 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidClusterException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidClusterException.java
@@ -21,29 +21,27 @@ package org.apache.stratos.cloud.controller.exception;
/**
* Throws when a {@link Partition} is evaluated to be invalid.
- *
- *
*/
public class InvalidClusterException extends Exception {
private static final long serialVersionUID = -7883324379272628566L;
private String message;
-
+
public InvalidClusterException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidClusterException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCompositeApplicationDefinitionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCompositeApplicationDefinitionException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCompositeApplicationDefinitionException.java
index a7c2bb6..1505e1e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCompositeApplicationDefinitionException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCompositeApplicationDefinitionException.java
@@ -19,26 +19,26 @@
package org.apache.stratos.cloud.controller.exception;
public class InvalidCompositeApplicationDefinitionException extends Exception {
-
+
private static final long serialVersionUID = -1L;
private String message;
-
+
public InvalidCompositeApplicationDefinitionException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidCompositeApplicationDefinitionException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidHostException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidHostException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidHostException.java
index ab63bb9..71b8f59 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidHostException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidHostException.java
@@ -21,29 +21,27 @@ package org.apache.stratos.cloud.controller.exception;
/**
* Throws when a {@link Partition} is evaluated to be invalid.
- *
- *
*/
public class InvalidHostException extends Exception {
private static final long serialVersionUID = 9125466293508957338L;
private String message;
-
+
public InvalidHostException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidHostException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidIaasProviderException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidIaasProviderException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidIaasProviderException.java
index 7e5590c..c332935 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidIaasProviderException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidIaasProviderException.java
@@ -20,29 +20,27 @@ package org.apache.stratos.cloud.controller.exception;
/**
* Throws when a {@link IaasProvider} is evaluated to be invalid.
- *
- *
*/
public class InvalidIaasProviderException extends Exception {
private static final long serialVersionUID = 2453133690565031869L;
private String message;
-
+
public InvalidIaasProviderException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidIaasProviderException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesClusterException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesClusterException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesClusterException.java
index 3b5b930..9eec7db 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesClusterException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesClusterException.java
@@ -28,16 +28,16 @@ public class InvalidKubernetesClusterException extends Exception {
private String message;
- public InvalidKubernetesClusterException(String message, Exception exception){
+ public InvalidKubernetesClusterException(String message, Exception exception) {
super(message, exception);
this.message = message;
}
- public InvalidKubernetesClusterException(Exception exception){
+ public InvalidKubernetesClusterException(Exception exception) {
super(exception);
}
- public InvalidKubernetesClusterException(String msg){
+ public InvalidKubernetesClusterException(String msg) {
super(msg);
this.message = msg;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesHostException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesHostException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesHostException.java
index 0aa789e..285c1fd 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesHostException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesHostException.java
@@ -28,16 +28,16 @@ public class InvalidKubernetesHostException extends Exception {
private String message;
- public InvalidKubernetesHostException(String message, Exception exception){
+ public InvalidKubernetesHostException(String message, Exception exception) {
super(message, exception);
this.message = message;
}
- public InvalidKubernetesHostException(Exception exception){
+ public InvalidKubernetesHostException(Exception exception) {
super(exception);
}
- public InvalidKubernetesHostException(String msg){
+ public InvalidKubernetesHostException(String msg) {
super(msg);
this.message = msg;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesMasterException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesMasterException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesMasterException.java
index da52e9a..538b093 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesMasterException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidKubernetesMasterException.java
@@ -6,16 +6,16 @@ package org.apache.stratos.cloud.controller.exception;
public class InvalidKubernetesMasterException extends Exception {
private String message;
- public InvalidKubernetesMasterException(String message, Exception exception){
+ public InvalidKubernetesMasterException(String message, Exception exception) {
super(message, exception);
this.message = message;
}
- public InvalidKubernetesMasterException(Exception exception){
+ public InvalidKubernetesMasterException(Exception exception) {
super(exception);
}
- public InvalidKubernetesMasterException(String msg){
+ public InvalidKubernetesMasterException(String msg) {
super(msg);
this.message = msg;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidMemberException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidMemberException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidMemberException.java
index 8fc96de..9d69263 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidMemberException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidMemberException.java
@@ -21,29 +21,27 @@ package org.apache.stratos.cloud.controller.exception;
/**
* Throws when a {@link Partition} is evaluated to be invalid.
- *
- *
*/
public class InvalidMemberException extends Exception {
private static final long serialVersionUID = -7883324379272628566L;
private String message;
-
+
public InvalidMemberException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidMemberException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
index 9da2c77..9a37ca7 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
@@ -21,29 +21,27 @@ package org.apache.stratos.cloud.controller.exception;
/**
* Throws when a {@link Partition} is evaluated to be invalid.
- *
- *
*/
public class InvalidPartitionException extends Exception {
private static final long serialVersionUID = 5403224496111965638L;
- private String message;
+ private String message;
public InvalidPartitionException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidPartitionException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
-
+
private void setMessage(String msg) {
- this.message = msg;
- }
+ this.message = msg;
+ }
- public String getMessage() {
+ public String getMessage() {
return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidRegionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidRegionException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidRegionException.java
index d00b4ad..ec321e6 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidRegionException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidRegionException.java
@@ -21,29 +21,27 @@ package org.apache.stratos.cloud.controller.exception;
/**
* Throws when a {@link Partition} is evaluated to be invalid.
- *
- *
*/
public class InvalidRegionException extends Exception {
private static final long serialVersionUID = -7883324379272628566L;
- private String message;
+ private String message;
public InvalidRegionException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidRegionException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
-
+
private void setMessage(String msg) {
- this.message = msg;
- }
+ this.message = msg;
+ }
- public String getMessage() {
+ public String getMessage() {
return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidServiceGroupException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidServiceGroupException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidServiceGroupException.java
index 10b65dc..1559f96 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidServiceGroupException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidServiceGroupException.java
@@ -19,28 +19,28 @@
package org.apache.stratos.cloud.controller.exception;
public class InvalidServiceGroupException extends Exception {
-
- private static final long serialVersionUID = 2651280146514042590L;
-
- private String message;
-
+
+ private static final long serialVersionUID = 2651280146514042590L;
+
+ private String message;
+
public InvalidServiceGroupException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidServiceGroupException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidXMLException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidXMLException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidXMLException.java
index 6956f75..2d6e24c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidXMLException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidXMLException.java
@@ -19,29 +19,29 @@
package org.apache.stratos.cloud.controller.exception;
public class InvalidXMLException extends RuntimeException {
-
+
private static final long serialVersionUID = -6326227079367867222L;
- private String message;
+ private String message;
public InvalidXMLException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidXMLException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
-
+
public InvalidXMLException(Exception ex) {
super(ex);
}
-
+
private void setMessage(String msg) {
- this.message = msg;
- }
+ this.message = msg;
+ }
- public String getMessage() {
+ public String getMessage() {
return this.message;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidZoneException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidZoneException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidZoneException.java
index 83cd4ac..e29bb48 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidZoneException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidZoneException.java
@@ -21,29 +21,27 @@ package org.apache.stratos.cloud.controller.exception;
/**
* Throws when a {@link Partition} is evaluated to be invalid.
- *
- *
*/
public class InvalidZoneException extends Exception {
private static final long serialVersionUID = 1830765777991647319L;
- private String message;
+ private String message;
public InvalidZoneException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public InvalidZoneException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
-
+
private void setMessage(String msg) {
- this.message = msg;
- }
+ this.message = msg;
+ }
- public String getMessage() {
+ public String getMessage() {
return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/KubernetesEndpointValidationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/KubernetesEndpointValidationException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/KubernetesEndpointValidationException.java
index 8394a62..29edda9 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/KubernetesEndpointValidationException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/KubernetesEndpointValidationException.java
@@ -27,7 +27,7 @@ package org.apache.stratos.cloud.controller.exception;
public class KubernetesEndpointValidationException extends Exception {
private String message;
- public KubernetesEndpointValidationException(String message, Exception exception){
+ public KubernetesEndpointValidationException(String message, Exception exception) {
super(message, exception);
this.setMessage(message);
}
@@ -36,7 +36,8 @@ public class KubernetesEndpointValidationException extends Exception {
super(msg);
this.message = msg;
}
- public KubernetesEndpointValidationException(Exception exception){
+
+ public KubernetesEndpointValidationException(Exception exception) {
super(exception);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/MemberTerminationFailedException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/MemberTerminationFailedException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/MemberTerminationFailedException.java
index 1db68b5..24573eb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/MemberTerminationFailedException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/MemberTerminationFailedException.java
@@ -21,28 +21,27 @@ package org.apache.stratos.cloud.controller.exception;
/**
* Throws when a member termination fails.
- *
*/
public class MemberTerminationFailedException extends Exception {
private static final long serialVersionUID = -7883324379272628566L;
private String message;
-
+
public MemberTerminationFailedException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public MemberTerminationFailedException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionAlreadyExistsException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionAlreadyExistsException.java
index d1ce335..7bb5416 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionAlreadyExistsException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionAlreadyExistsException.java
@@ -18,9 +18,9 @@
*/
package org.apache.stratos.cloud.controller.exception;
-public class NetworkPartitionAlreadyExistsException extends Exception{
+public class NetworkPartitionAlreadyExistsException extends Exception {
- public NetworkPartitionAlreadyExistsException(String message) {
- super(message);
- }
+ public NetworkPartitionAlreadyExistsException(String message) {
+ super(message);
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionNotExistsException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionNotExistsException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionNotExistsException.java
index 8d13ac2..d15ca0a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionNotExistsException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NetworkPartitionNotExistsException.java
@@ -20,9 +20,9 @@
*/
package org.apache.stratos.cloud.controller.exception;
-public class NetworkPartitionNotExistsException extends Exception{
+public class NetworkPartitionNotExistsException extends Exception {
- public NetworkPartitionNotExistsException(String message) {
- super(message);
- }
+ public NetworkPartitionNotExistsException(String message) {
+ super(message);
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NoInstanceFoundException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NoInstanceFoundException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NoInstanceFoundException.java
index 68a1cd6..6a60d41 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NoInstanceFoundException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NoInstanceFoundException.java
@@ -27,24 +27,24 @@ public class NoInstanceFoundException extends Exception {
* For serializing requirement
*/
private static final long serialVersionUID = -435060299292679892L;
- private String message;
+ private String message;
public NoInstanceFoundException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public NoInstanceFoundException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
-
+
private void setMessage(String msg) {
- this.message = msg;
- }
+ this.message = msg;
+ }
- public String getMessage() {
+ public String getMessage() {
return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesClusterException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesClusterException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesClusterException.java
index e425163..00a6512 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesClusterException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesClusterException.java
@@ -28,16 +28,16 @@ public class NonExistingKubernetesClusterException extends Exception {
private String message;
- public NonExistingKubernetesClusterException(String message, Exception exception){
+ public NonExistingKubernetesClusterException(String message, Exception exception) {
super(message, exception);
this.message = message;
}
- public NonExistingKubernetesClusterException(Exception exception){
+ public NonExistingKubernetesClusterException(Exception exception) {
super(exception);
}
- public NonExistingKubernetesClusterException(String msg){
+ public NonExistingKubernetesClusterException(String msg) {
super(msg);
this.message = msg;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesHostException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesHostException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesHostException.java
index afae051..dd218ae 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesHostException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesHostException.java
@@ -27,16 +27,16 @@ package org.apache.stratos.cloud.controller.exception;
public class NonExistingKubernetesHostException extends Exception {
private String message;
- public NonExistingKubernetesHostException(String message, Exception exception){
+ public NonExistingKubernetesHostException(String message, Exception exception) {
super(message, exception);
this.message = message;
}
- public NonExistingKubernetesHostException(Exception exception){
+ public NonExistingKubernetesHostException(Exception exception) {
super(exception);
}
- public NonExistingKubernetesHostException(String msg){
+ public NonExistingKubernetesHostException(String msg) {
super(msg);
this.message = msg;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesMasterException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesMasterException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesMasterException.java
index 8eb50c1..9f4464a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesMasterException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NonExistingKubernetesMasterException.java
@@ -27,16 +27,16 @@ package org.apache.stratos.cloud.controller.exception;
public class NonExistingKubernetesMasterException extends Exception {
private String message;
- public NonExistingKubernetesMasterException(String message, Exception exception){
+ public NonExistingKubernetesMasterException(String message, Exception exception) {
super(message, exception);
this.message = message;
}
- public NonExistingKubernetesMasterException(Exception exception){
+ public NonExistingKubernetesMasterException(Exception exception) {
super(exception);
}
- public NonExistingKubernetesMasterException(String msg){
+ public NonExistingKubernetesMasterException(String msg) {
super(msg);
this.message = msg;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/SerializationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/SerializationException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/SerializationException.java
index 92ed0b9..b3e8ef8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/SerializationException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/SerializationException.java
@@ -19,25 +19,25 @@
package org.apache.stratos.cloud.controller.exception;
public class SerializationException extends RuntimeException {
-
+
private static final long serialVersionUID = -3701458642228072331L;
- private String message;
+ private String message;
public SerializationException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public SerializationException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
-
+
private void setMessage(String msg) {
- this.message = msg;
- }
+ this.message = msg;
+ }
- public String getMessage() {
+ public String getMessage() {
return this.message;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredClusterException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredClusterException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredClusterException.java
index c7851e0..f5935e0 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredClusterException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredClusterException.java
@@ -19,25 +19,25 @@
package org.apache.stratos.cloud.controller.exception;
public class UnregisteredClusterException extends Exception {
-
+
private static final long serialVersionUID = -6326227079367867222L;
- private String message;
+ private String message;
public UnregisteredClusterException(String msg) {
super(msg);
this.setMessage(msg);
}
-
+
public UnregisteredClusterException(String msg, Exception ex) {
super(msg, ex);
this.setMessage(msg);
}
private void setMessage(String msg) {
- this.message = msg;
- }
+ this.message = msg;
+ }
- public String getMessage() {
+ public String getMessage() {
return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/Iaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/Iaas.java
index 2fc0c36..de7dc09 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/Iaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/Iaas.java
@@ -40,6 +40,7 @@ public abstract class Iaas {
/**
* Set iaas provider.
+ *
* @param iaasProvider
*/
public void setIaasProvider(IaasProvider iaasProvider) {
@@ -148,6 +149,7 @@ public abstract class Iaas {
/**
* Allocates ip addresses to member.
+ *
* @param clusterId
* @param memberContext
* @param partition
@@ -161,6 +163,7 @@ public abstract class Iaas {
/**
* Terminate an instance.
+ *
* @param memberContext
* @throws InvalidCartridgeTypeException
* @throws InvalidMemberException
[6/6] stratos git commit: Organize imports in CC component
Posted by la...@apache.org.
Organize imports in CC component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4e7c1811
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4e7c1811
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4e7c1811
Branch: refs/heads/master
Commit: 4e7c181163bd4bc2c46978008911a3a996b7b6c4
Parents: de76b38
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Apr 7 13:04:56 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Apr 7 13:04:56 2015 +0530
----------------------------------------------------------------------
.../concurrent/PartitionValidatorCallable.java | 4 +-
.../parser/CloudControllerConfigParser.java | 2 +-
.../context/CloudControllerContext.java | 1 -
.../deployers/CloudControllerDeployer.java | 2 +-
.../cloud/controller/domain/Cartridge.java | 5 ++-
.../controller/domain/DataPublisherConfig.java | 4 +-
.../cloud/controller/domain/Dependencies.java | 1 -
.../cloud/controller/domain/IaasConfig.java | 4 +-
.../stratos/cloud/controller/iaases/Iaas.java | 4 +-
.../cloud/controller/iaases/JcloudsIaas.java | 1 -
.../controller/iaases/PartitionValidator.java | 6 +--
.../iaases/cloudstack/CloudStackIaas.java | 18 ++++-----
.../CloudStackPartitionValidator.java | 4 +-
.../controller/iaases/docker/DockerIaas.java | 4 +-
.../cloud/controller/iaases/ec2/EC2Iaas.java | 15 +++-----
.../iaases/ec2/EC2PartitionValidator.java | 2 +-
.../cloud/controller/iaases/gce/GCEIaas.java | 40 ++++++++------------
.../iaases/gce/GCEPartitionValidator.java | 6 +--
.../iaases/kubernetes/KubernetesIaas.java | 1 -
.../iaases/kubernetes/KubernetesIaasUtil.java | 2 +-
.../openstack/OpenstackPartitionValidator.java | 2 +-
.../networking/NeutronNetworkingApi.java | 23 ++++-------
.../openstack/networking/NovaNetworkingApi.java | 19 +++++-----
.../networking/OpenstackNetworkingApi.java | 4 +-
.../controller/iaases/vcloud/VCloudIaas.java | 35 ++++++-----------
.../iaases/vcloud/VCloudPartitionValidator.java | 6 +--
.../messaging/topology/TopologyBuilder.java | 5 +--
.../services/CloudControllerService.java | 2 +-
.../impl/CloudControllerServiceImpl.java | 2 -
.../impl/CloudControllerServiceUtil.java | 7 ++--
.../services/impl/InstanceCreator.java | 3 +-
.../publisher/BAMUsageDataPublisher.java | 4 +-
.../controller/util/CloudControllerUtil.java | 16 +++-----
.../util/ComputeServiceBuilderUtil.java | 3 +-
.../service/axiom/AxiomValidationTest.java | 5 +--
.../networking/NeutronNetworkingApiTest.java | 8 ++--
36 files changed, 111 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
index 2f73f8f..e1800ff 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
@@ -18,8 +18,6 @@
*/
package org.apache.stratos.cloud.controller.concurrent;
-import java.util.concurrent.Callable;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.context.CloudControllerContext;
@@ -28,6 +26,8 @@ import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
+import java.util.concurrent.Callable;
+
public class PartitionValidatorCallable implements Callable<IaasProvider> {
private static final Log log = LogFactory.getLog(PartitionValidatorCallable.class);
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
index f1e3db4..22bb7b2 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/config/parser/CloudControllerConfigParser.java
@@ -27,8 +27,8 @@ import org.apache.stratos.cloud.controller.config.CloudControllerConfig;
import org.apache.stratos.cloud.controller.domain.DataPublisherConfig;
import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.TopologyConfig;
-import org.apache.stratos.common.exception.MalformedConfigurationFileException;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
+import org.apache.stratos.common.exception.MalformedConfigurationFileException;
import org.apache.stratos.common.util.AxiomXpathParserUtil;
import javax.xml.namespace.QName;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
index f9a73c3..57d729d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
@@ -32,7 +32,6 @@ import org.apache.stratos.cloud.controller.exception.NonExistingKubernetesHostEx
import org.apache.stratos.cloud.controller.internal.ServiceReferenceHolder;
import org.apache.stratos.cloud.controller.registry.RegistryManager;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
-import org.apache.stratos.cloud.controller.domain.NetworkPartition;
import org.apache.stratos.common.services.DistributedObjectProvider;
import org.apache.stratos.common.threading.StratosThreadPool;
import org.wso2.carbon.databridge.agent.thrift.AsyncDataPublisher;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
index e0c9422..762818a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployers/CloudControllerDeployer.java
@@ -26,9 +26,9 @@ import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.config.CloudControllerConfig;
-import org.apache.stratos.common.util.AxiomXpathParserUtil;
import org.apache.stratos.cloud.controller.config.parser.CloudControllerConfigParser;
import org.apache.stratos.cloud.controller.domain.IaasProvider;
+import org.apache.stratos.common.util.AxiomXpathParserUtil;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
index 6c78642..27b84be 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
@@ -22,11 +22,12 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.*;
import org.apache.stratos.common.Properties;
+import org.apache.stratos.common.Property;
import java.io.Serializable;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
/**
* Holds information regarding a Cartridge.
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
index 5e72c47..8239d85 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/DataPublisherConfig.java
@@ -18,10 +18,10 @@
*/
package org.apache.stratos.cloud.controller.domain;
-import java.io.Serializable;
-
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
+import java.io.Serializable;
+
/**
*
*
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
index 9299528..293881a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Dependencies.java
@@ -20,7 +20,6 @@
package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
-import java.util.List;
public class Dependencies implements Serializable {
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
index 3db5e63..1d427e2 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/IaasConfig.java
@@ -19,12 +19,12 @@
package org.apache.stratos.cloud.controller.domain;
-import java.io.Serializable;
-
import org.apache.commons.lang3.ArrayUtils;
import org.apache.stratos.common.Properties;
import org.apache.stratos.common.Property;
+import java.io.Serializable;
+
/**
* This class is used to support <link>CartridgeConfig</link>
* class for the Rest API
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/Iaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/Iaas.java
index de7dc09..1b17ddc 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/Iaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/Iaas.java
@@ -18,7 +18,9 @@
*/
package org.apache.stratos.cloud.controller.iaases;
-import org.apache.stratos.cloud.controller.domain.*;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
+import org.apache.stratos.cloud.controller.domain.MemberContext;
+import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.exception.*;
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
index 1fbd577..4da8bf2 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
@@ -30,7 +30,6 @@ import org.apache.stratos.cloud.controller.exception.InvalidIaasProviderExceptio
import org.apache.stratos.cloud.controller.exception.InvalidMemberException;
import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
-
import org.jclouds.compute.ComputeService;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.NodeMetadataBuilder;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/PartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/PartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/PartitionValidator.java
index b97cb43..41b3da1 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/PartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/PartitionValidator.java
@@ -18,11 +18,11 @@
*/
package org.apache.stratos.cloud.controller.iaases;
-import java.util.Properties;
-
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
+
+import java.util.Properties;
/**
* All the IaaSes needs to write a partition validator which implements this interface.
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackIaas.java
index 0e31801..43f4853 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackIaas.java
@@ -4,18 +4,21 @@ package org.apache.stratos.cloud.controller.iaases.cloudstack;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.exception.InvalidHostException;
import org.apache.stratos.cloud.controller.exception.InvalidRegionException;
import org.apache.stratos.cloud.controller.exception.InvalidZoneException;
import org.apache.stratos.cloud.controller.iaases.JcloudsIaas;
-import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
-import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
+import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
+import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
import org.jclouds.cloudstack.CloudStackApi;
import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.*;
+import org.jclouds.cloudstack.domain.PublicIPAddress;
+import org.jclouds.cloudstack.domain.SshKeyPair;
+import org.jclouds.cloudstack.domain.Volume;
+import org.jclouds.cloudstack.domain.Zone;
import org.jclouds.cloudstack.features.VolumeApi;
import org.jclouds.cloudstack.options.ListPublicIPAddressesOptions;
import org.jclouds.cloudstack.options.ListZonesOptions;
@@ -27,12 +30,7 @@ import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.domain.Location;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.TimeoutException;
public class CloudStackIaas extends JcloudsIaas {
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
index 4245a4b..9e5d406 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
@@ -2,12 +2,12 @@ package org.apache.stratos.cloud.controller.iaases.cloudstack;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
import org.apache.stratos.cloud.controller.iaases.Iaas;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
-import org.apache.stratos.cloud.controller.iaases.ec2.EC2PartitionValidator;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
+import org.apache.stratos.cloud.controller.iaases.ec2.EC2PartitionValidator;
import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.messaging.domain.topology.Scope;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/docker/DockerIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/docker/DockerIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/docker/DockerIaas.java
index 0ec1f6b..aeb4961 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/docker/DockerIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/docker/DockerIaas.java
@@ -21,15 +21,15 @@ package org.apache.stratos.cloud.controller.iaases.docker;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.exception.InvalidHostException;
import org.apache.stratos.cloud.controller.exception.InvalidRegionException;
import org.apache.stratos.cloud.controller.exception.InvalidZoneException;
import org.apache.stratos.cloud.controller.iaases.JcloudsIaas;
+import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.apache.stratos.cloud.controller.iaases.ec2.EC2Iaas;
import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
-import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.jclouds.compute.ComputeService;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.NodeMetadata;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2Iaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2Iaas.java
index f3354ea..f96d65a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2Iaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2Iaas.java
@@ -21,21 +21,20 @@ package org.apache.stratos.cloud.controller.iaases.ec2;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
+import org.apache.stratos.cloud.controller.domain.NetworkInterface;
import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.exception.InvalidHostException;
import org.apache.stratos.cloud.controller.exception.InvalidRegionException;
import org.apache.stratos.cloud.controller.exception.InvalidZoneException;
import org.apache.stratos.cloud.controller.iaases.JcloudsIaas;
-import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
-import org.apache.stratos.cloud.controller.domain.NetworkInterface;
+import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
-import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
+import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
import org.jclouds.aws.ec2.AWSEC2Api;
import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions;
import org.jclouds.aws.ec2.features.AWSKeyPairApi;
@@ -46,11 +45,7 @@ import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.domain.Location;
-import org.jclouds.ec2.domain.Attachment;
-import org.jclouds.ec2.domain.AvailabilityZoneInfo;
-import org.jclouds.ec2.domain.KeyPair;
-import org.jclouds.ec2.domain.PublicIpInstanceIdPair;
-import org.jclouds.ec2.domain.Volume;
+import org.jclouds.ec2.domain.*;
import org.jclouds.ec2.features.AvailabilityZoneAndRegionApi;
import org.jclouds.ec2.features.ElasticBlockStoreApi;
import org.jclouds.ec2.features.ElasticIPAddressApi;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2PartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2PartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2PartitionValidator.java
index 812257b..2845547 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2PartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2PartitionValidator.java
@@ -20,11 +20,11 @@ package org.apache.stratos.cloud.controller.iaases.ec2;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.exception.InvalidIaasProviderException;
import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
import org.apache.stratos.cloud.controller.iaases.Iaas;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java
index de14e1e..d8fb4eb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEIaas.java
@@ -18,20 +18,26 @@
*/
package org.apache.stratos.cloud.controller.iaases.gce;
-import java.util.*;
-
+import com.google.common.base.Predicate;
+import com.google.common.util.concurrent.Atomics;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.TypeLiteral;
+import com.google.inject.name.Names;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.cloud.controller.exception.CloudControllerException;
-import org.apache.stratos.cloud.controller.iaases.JcloudsIaas;
-import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.NetworkInterface;
-import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
+import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.exception.InvalidHostException;
import org.apache.stratos.cloud.controller.exception.InvalidRegionException;
import org.apache.stratos.cloud.controller.exception.InvalidZoneException;
+import org.apache.stratos.cloud.controller.iaases.JcloudsIaas;
+import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
+import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
+import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
import org.jclouds.ContextBuilder;
+import org.jclouds.collect.IterableWithMarker;
import org.jclouds.compute.ComputeService;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.domain.NodeMetadata;
@@ -39,34 +45,20 @@ import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.domain.Location;
-import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
-import org.jclouds.collect.IterableWithMarker;
import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
+import org.jclouds.googlecomputeengine.domain.*;
import org.jclouds.googlecomputeengine.features.DiskApi;
import org.jclouds.googlecomputeengine.features.InstanceApi;
import org.jclouds.googlecomputeengine.features.RegionApi;
import org.jclouds.googlecomputeengine.features.ZoneApi;
-import org.jclouds.googlecomputeengine.domain.Disk;
-import org.jclouds.googlecomputeengine.domain.Instance;
-import org.jclouds.googlecomputeengine.domain.Region;
-import org.jclouds.googlecomputeengine.domain.Zone;
-import org.jclouds.googlecomputeengine.domain.Operation;
import org.jclouds.googlecomputeengine.options.AttachDiskOptions;
import org.jclouds.googlecomputeengine.options.AttachDiskOptions.DiskType;
-import com.google.inject.Key;
-import com.google.inject.Injector;
-import com.google.inject.TypeLiteral;
-import com.google.inject.name.Names;
-
-import static org.jclouds.util.Predicates2.retry;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-import com.google.common.base.Predicate;
-
+import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
-import com.google.common.util.concurrent.Atomics;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.jclouds.util.Predicates2.retry;
public class GCEIaas extends JcloudsIaas {
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEPartitionValidator.java
index dc2733b..80fcd7f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEPartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/gce/GCEPartitionValidator.java
@@ -18,16 +18,16 @@
*/
package org.apache.stratos.cloud.controller.iaases.gce;
-import java.util.Properties;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.apache.stratos.cloud.controller.iaases.vcloud.VCloudPartitionValidator;
+import java.util.Properties;
+
/**
* The VCloud {@link org.apache.stratos.cloud.controller.iaases.PartitionValidator} implementation.
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
index 554ea6c..e557692 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
@@ -33,7 +33,6 @@ import org.apache.stratos.cloud.controller.exception.*;
import org.apache.stratos.cloud.controller.iaases.Iaas;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
-import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.common.Property;
import org.apache.stratos.common.constants.StratosConstants;
import org.apache.stratos.common.domain.NameValuePair;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java
index 7bfc68e..1aa3e77 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java
@@ -26,8 +26,8 @@ import org.apache.stratos.cloud.controller.domain.MemberContext;
import org.apache.stratos.cloud.controller.domain.PortMapping;
import org.apache.stratos.common.Properties;
import org.apache.stratos.common.Property;
-import org.apache.stratos.common.domain.NameValuePair;
import org.apache.stratos.common.constants.StratosConstants;
+import org.apache.stratos.common.domain.NameValuePair;
import org.apache.stratos.kubernetes.client.model.EnvironmentVariable;
import org.apache.stratos.kubernetes.client.model.Port;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/OpenstackPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/OpenstackPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/OpenstackPartitionValidator.java
index bde75ea..a657c9e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/OpenstackPartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/OpenstackPartitionValidator.java
@@ -20,11 +20,11 @@ package org.apache.stratos.cloud.controller.iaases.openstack;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.exception.InvalidIaasProviderException;
import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
import org.apache.stratos.cloud.controller.iaases.Iaas;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApi.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApi.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApi.java
index 864d23d..66de75e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApi.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApi.java
@@ -18,21 +18,19 @@
*/
package org.apache.stratos.cloud.controller.iaases.openstack.networking;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.net.InetAddresses;
+import com.google.inject.Module;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.domain.FloatingNetwork;
import org.apache.stratos.cloud.controller.domain.FloatingNetworks;
import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.NetworkInterface;
+import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
@@ -46,12 +44,7 @@ import org.jclouds.openstack.neutron.v2.domain.Port;
import org.jclouds.openstack.neutron.v2.extensions.FloatingIPApi;
import org.jclouds.openstack.neutron.v2.features.PortApi;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.net.InetAddresses;
-import com.google.inject.Module;
+import java.util.*;
/**
* Leveraging openstack-neutron networking apis.
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/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 683c0a3..2ef2fbe 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
@@ -18,17 +18,17 @@
*/
package org.apache.stratos.cloud.controller.iaases.openstack.networking;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.cloud.controller.exception.CloudControllerException;
-import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
import org.apache.stratos.cloud.controller.domain.IaasProvider;
+import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
+import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.NodeMetadataBuilder;
@@ -36,10 +36,9 @@ import org.jclouds.openstack.nova.v2_0.NovaApi;
import org.jclouds.openstack.nova.v2_0.domain.FloatingIP;
import org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* Leveraging openstack-nova networking apis.
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/OpenstackNetworkingApi.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/OpenstackNetworkingApi.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/OpenstackNetworkingApi.java
index 6de58d1..ef222be 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/OpenstackNetworkingApi.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/OpenstackNetworkingApi.java
@@ -18,10 +18,10 @@
*/
package org.apache.stratos.cloud.controller.iaases.openstack.networking;
-import java.util.List;
-
import org.jclouds.compute.domain.NodeMetadata;
+import java.util.List;
+
/**
* Openstack can support Neutron Network or Nova Network, but not both at same time.
* Each have different ways of assigning and releasing Floating IPs.
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/vcloud/VCloudIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/vcloud/VCloudIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/vcloud/VCloudIaas.java
index b1f74b9..cffaff0 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/vcloud/VCloudIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/vcloud/VCloudIaas.java
@@ -22,49 +22,38 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
+import org.apache.stratos.cloud.controller.domain.NetworkInterface;
import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.iaases.JcloudsIaas;
-import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
+import org.apache.stratos.cloud.controller.util.ComputeServiceBuilderUtil;
import org.jclouds.compute.ComputeService;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.options.TemplateOptions;
+import org.jclouds.vcloud.VCloudApi;
import org.jclouds.vcloud.compute.options.VCloudTemplateOptions;
+import org.jclouds.vcloud.domain.DiskAttachOrDetachParams;
+import org.jclouds.vcloud.domain.NetworkConnection;
+import org.jclouds.vcloud.domain.Task;
+import org.jclouds.vcloud.domain.Vm;
import org.jclouds.vcloud.domain.network.IpAddressAllocationMode;
+import org.jclouds.vcloud.domain.network.OrgNetwork;
+import org.jclouds.vcloud.features.VAppApi;
+import org.jclouds.vcloud.features.VmApi;
import org.wso2.carbon.utils.CarbonUtils;
import java.io.File;
import java.io.IOException;
+import java.net.URI;
import java.net.URISyntaxException;
import java.util.Hashtable;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import java.net.URI;
-
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
-import org.apache.stratos.cloud.controller.domain.NetworkInterface;
-import org.apache.stratos.cloud.controller.iaases.vcloud.VCloudPartitionValidator;
-import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
-import org.jclouds.ContextBuilder;
-import org.jclouds.rest.RestContext;
-import org.jclouds.vcloud.VCloudApi;
-import org.jclouds.vcloud.domain.NetworkConnectionSection;
-import org.jclouds.vcloud.domain.ovf.VCloudHardDisk;
-import org.jclouds.vcloud.domain.NetworkConnection;
-import org.jclouds.vcloud.domain.Task;
-import org.jclouds.vcloud.domain.Vm;
-import org.jclouds.vcloud.domain.network.OrgNetwork;
-import org.jclouds.vcloud.domain.ovf.VCloudVirtualHardwareSection;
-import org.jclouds.vcloud.features.VAppApi;
-import org.jclouds.vcloud.features.VmApi;
-import org.jclouds.vcloud.domain.VApp;
-import org.jclouds.vcloud.options.InstantiateVAppTemplateOptions;
-import org.jclouds.vcloud.domain.DiskAttachOrDetachParams;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/vcloud/VCloudPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/vcloud/VCloudPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/vcloud/VCloudPartitionValidator.java
index 81c9f6b..d2dfc13 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/vcloud/VCloudPartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/vcloud/VCloudPartitionValidator.java
@@ -18,16 +18,16 @@
*/
package org.apache.stratos.cloud.controller.iaases.vcloud;
-import java.util.Properties;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
import org.apache.stratos.cloud.controller.iaases.Iaas;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
+import java.util.Properties;
+
/**
* The VCloud {@link org.apache.stratos.cloud.controller.iaases.PartitionValidator} implementation.
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
index b3ff4e8..6efe1b7 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
@@ -24,10 +24,10 @@ import org.apache.stratos.cloud.controller.context.CloudControllerContext;
import org.apache.stratos.cloud.controller.domain.*;
import org.apache.stratos.cloud.controller.exception.InvalidCartridgeTypeException;
import org.apache.stratos.cloud.controller.exception.InvalidMemberException;
-import org.apache.stratos.cloud.controller.statistics.publisher.BAMUsageDataPublisher;
import org.apache.stratos.cloud.controller.messaging.publisher.TopologyEventPublisher;
+import org.apache.stratos.cloud.controller.statistics.publisher.BAMUsageDataPublisher;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
-import org.apache.stratos.common.*;
+import org.apache.stratos.common.Property;
import org.apache.stratos.messaging.domain.application.ClusterDataHolder;
import org.apache.stratos.messaging.domain.instance.ClusterInstance;
import org.apache.stratos.messaging.domain.topology.*;
@@ -42,7 +42,6 @@ import org.apache.stratos.metadata.client.defaults.DefaultMetaDataServiceClient;
import org.apache.stratos.metadata.client.defaults.MetaDataServiceClient;
import java.util.*;
-import java.util.Properties;
/**
* this is to manipulate the received events by cloud controller
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
index 83584d5..d43f78c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
@@ -19,10 +19,10 @@
package org.apache.stratos.cloud.controller.services;
import org.apache.stratos.cloud.controller.domain.*;
-import org.apache.stratos.cloud.controller.exception.*;
import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesCluster;
import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesHost;
import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesMaster;
+import org.apache.stratos.cloud.controller.exception.*;
import org.apache.stratos.messaging.domain.topology.ClusterStatus;
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 77a3466..05a7230 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -34,8 +34,6 @@ import org.apache.stratos.cloud.controller.messaging.topology.TopologyBuilder;
import org.apache.stratos.cloud.controller.messaging.topology.TopologyManager;
import org.apache.stratos.cloud.controller.services.CloudControllerService;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
-import org.apache.stratos.cloud.controller.domain.NetworkPartition;
-
import org.apache.stratos.common.Property;
import org.apache.stratos.common.domain.LoadBalancingIPType;
import org.apache.stratos.common.threading.StratosThreadPool;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
index 9611b31..9bed8a0 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
@@ -23,15 +23,16 @@ import com.google.common.net.InetAddresses;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.context.CloudControllerContext;
-import org.apache.stratos.cloud.controller.domain.*;
+import org.apache.stratos.cloud.controller.domain.IaasProvider;
+import org.apache.stratos.cloud.controller.domain.MemberContext;
+import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.exception.InvalidIaasProviderException;
import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
import org.apache.stratos.cloud.controller.iaases.Iaas;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
-import org.apache.stratos.cloud.controller.statistics.publisher.BAMUsageDataPublisher;
import org.apache.stratos.cloud.controller.messaging.topology.TopologyBuilder;
+import org.apache.stratos.cloud.controller.statistics.publisher.BAMUsageDataPublisher;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
-
import org.apache.stratos.messaging.domain.topology.MemberStatus;
import java.util.Properties;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceCreator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceCreator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceCreator.java
index 49065c9..1cd5f97 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceCreator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceCreator.java
@@ -26,9 +26,8 @@ import org.apache.stratos.cloud.controller.context.CloudControllerContext;
import org.apache.stratos.cloud.controller.domain.*;
import org.apache.stratos.cloud.controller.exception.CartridgeNotFoundException;
import org.apache.stratos.cloud.controller.iaases.Iaas;
-import org.apache.stratos.cloud.controller.statistics.publisher.BAMUsageDataPublisher;
import org.apache.stratos.cloud.controller.messaging.topology.TopologyBuilder;
-import org.apache.stratos.cloud.controller.domain.Partition;
+import org.apache.stratos.cloud.controller.statistics.publisher.BAMUsageDataPublisher;
import org.apache.stratos.messaging.domain.topology.MemberStatus;
import java.util.concurrent.locks.Lock;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/statistics/publisher/BAMUsageDataPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/statistics/publisher/BAMUsageDataPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/statistics/publisher/BAMUsageDataPublisher.java
index 588cb01..c5cb3bd 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/statistics/publisher/BAMUsageDataPublisher.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/statistics/publisher/BAMUsageDataPublisher.java
@@ -22,10 +22,10 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.config.CloudControllerConfig;
import org.apache.stratos.cloud.controller.context.CloudControllerContext;
-import org.apache.stratos.cloud.controller.domain.InstanceMetadata;
-import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.domain.Cartridge;
+import org.apache.stratos.cloud.controller.domain.InstanceMetadata;
import org.apache.stratos.cloud.controller.domain.MemberContext;
+import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.wso2.carbon.base.ServerConfiguration;
import org.wso2.carbon.databridge.agent.thrift.AsyncDataPublisher;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index d96638e..d1c21eb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -18,6 +18,7 @@
*/
package org.apache.stratos.cloud.controller.util;
+import com.google.common.net.InetAddresses;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.logging.Log;
@@ -25,24 +26,17 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.config.CloudControllerConfig;
import org.apache.stratos.cloud.controller.context.CloudControllerContext;
import org.apache.stratos.cloud.controller.domain.*;
-import org.apache.stratos.cloud.controller.exception.CloudControllerException;
-import org.apache.stratos.cloud.controller.exception.InvalidIaasProviderException;
-import org.apache.stratos.cloud.controller.exception.InvalidKubernetesClusterException;
-import org.apache.stratos.cloud.controller.exception.InvalidKubernetesHostException;
-import org.apache.stratos.cloud.controller.exception.InvalidKubernetesMasterException;
-import org.apache.stratos.cloud.controller.iaases.Iaas;
-import org.apache.stratos.cloud.controller.registry.RegistryManager;
-
-import org.apache.stratos.common.Property;
import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesCluster;
import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesHost;
import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesMaster;
+import org.apache.stratos.cloud.controller.exception.*;
+import org.apache.stratos.cloud.controller.iaases.Iaas;
+import org.apache.stratos.cloud.controller.registry.RegistryManager;
+import org.apache.stratos.common.Property;
import org.apache.stratos.common.domain.LoadBalancingIPType;
import org.apache.stratos.messaging.domain.topology.Topology;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import com.google.common.net.InetAddresses;
-
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ComputeServiceBuilderUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ComputeServiceBuilderUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ComputeServiceBuilderUtil.java
index 85ab3c8..8102761 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ComputeServiceBuilderUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ComputeServiceBuilderUtil.java
@@ -20,11 +20,10 @@ package org.apache.stratos.cloud.controller.util;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.domain.IaasProvider;
+import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.jclouds.ContextBuilder;
import org.jclouds.compute.ComputeService;
import org.jclouds.compute.ComputeServiceContext;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomValidationTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomValidationTest.java b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomValidationTest.java
index c9d30c1..f44fe09 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomValidationTest.java
+++ b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomValidationTest.java
@@ -18,13 +18,12 @@
*/
package org.apache.cartridge.autoscaler.service.axiom;
-import java.io.File;
-
+import junit.framework.TestCase;
import org.apache.axiom.om.OMElement;
import org.apache.stratos.common.util.AxiomXpathParserUtil;
import org.xml.sax.SAXParseException;
-import junit.framework.TestCase;
+import java.io.File;
public class AxiomValidationTest extends TestCase {
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e7c1811/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApiTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApiTest.java b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApiTest.java
index 4b90add..5117196 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApiTest.java
+++ b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApiTest.java
@@ -18,10 +18,7 @@
*/
package org.apache.stratos.cloud.controller.iaases.openstack.networking;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.stratos.cloud.controller.iaases.openstack.networking.NeutronNetworkingApi;
+import junit.framework.TestCase;
import org.apache.stratos.cloud.controller.domain.FloatingNetwork;
import org.apache.stratos.cloud.controller.domain.FloatingNetworks;
import org.apache.stratos.cloud.controller.domain.IaasProvider;
@@ -30,7 +27,8 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import junit.framework.TestCase;
+import java.util.List;
+import java.util.Map;
public class NeutronNetworkingApiTest extends TestCase {
[3/6] stratos git commit: Formatting cloud controller code
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
index 7956528..1fbd577 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
@@ -69,15 +69,17 @@ public abstract class JcloudsIaas extends Iaas {
/**
* This method should create a Key Pair corresponds to a given public key in the respective region having the name given.
* Also should override the value of the key pair in the {@link org.jclouds.compute.domain.Template} of this IaaS.
- * @param region region that the key pair will get created.
+ *
+ * @param region region that the key pair will get created.
* @param keyPairName name of the key pair. NOTE: Jclouds adds a prefix : <code>jclouds#</code>
- * @param publicKey public key, from which the key pair will be created.
+ * @param publicKey public key, from which the key pair will be created.
* @return whether the key pair creation is successful or not.
*/
public abstract boolean createKeyPairFromPublicKey(String region, String keyPairName, String publicKey);
/**
* This will obtain an IP addresses from the allocated list and associate that IP with this node.
+ *
* @param node Node to be associated with an IP.
* @return return list of associated public IPs.
*/
@@ -86,9 +88,10 @@ public abstract class JcloudsIaas extends Iaas {
/**
* This will obtain a predefined IP address and associate that IP with this node, if ip is already in use allocate ip from pool
* (through associateAddress())
+ *
* @param node Node to be associated with an IP.
- * @ip preallocated floating Ip
* @return associated public IP.
+ * @ip preallocated floating Ip
*/
public abstract String associatePredefinedAddress(NodeMetadata node, String ip);
@@ -174,7 +177,7 @@ public abstract class JcloudsIaas extends Iaas {
ComputeService computeService = getIaasProvider().getComputeService();
NodeMetadata nodeMetadata = computeService.getNodeMetadata(memberContext.getInstanceId());
- if(nodeMetadata == null) {
+ if (nodeMetadata == null) {
String message = "Node metadata not found: [node-id] " + memberContext.getInstanceId();
log.error(message);
throw new CloudControllerException(message);
@@ -189,7 +192,7 @@ public abstract class JcloudsIaas extends Iaas {
if (StringUtils.isNotBlank(preDefinedPublicIp)) {
// Allocate predefined public ip
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Allocating predefined public IP address: " +
"[cartridge-type] %s [member-id] %s [pre-defined-ip] %s",
memberContext.getCartridgeType(), memberContext.getMemberId(),
@@ -218,12 +221,12 @@ public abstract class JcloudsIaas extends Iaas {
associatedIPs.add(allocatedIp);
} else {
// Allocate dynamic public ip addresses
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Allocating dynamic public IP addresses: " +
"[cartridge-type] %s [member-id] %s",
memberContext.getCartridgeType(), memberContext.getMemberId()));
}
-
+
associatedIPs = associateAddresses(nodeMetadata);
// checking for null and empty is enough. If there are elements in this list, they are valid IPs
@@ -237,7 +240,7 @@ public abstract class JcloudsIaas extends Iaas {
throw new CloudControllerException(msg);
}
}
-
+
memberContext.setAllocatedIPs(associatedIPs.toArray(new String[associatedIPs.size()]));
log.info(String.format("IP addresses allocated to member: [cartridge-type] %s [member-id] %s " +
"[allocated-ip-addresses] %s ", memberContext.getCartridgeType(),
@@ -251,23 +254,23 @@ public abstract class JcloudsIaas extends Iaas {
// public IPs
Set<String> publicIPAddresses = nodeMetadata.getPublicAddresses();
if (publicIPAddresses != null && !publicIPAddresses.isEmpty()) {
- memberContext.setPublicIPs(publicIPAddresses.toArray(new String[publicIPAddresses.size()]));
- //TODO set a flag in cartridge definition to specify the default public IP or the interface
- memberContext.setDefaultPublicIP(publicIPAddresses.iterator().next());
- log.info("Retrieving public IP addresses: " + memberContext.toString());
+ memberContext.setPublicIPs(publicIPAddresses.toArray(new String[publicIPAddresses.size()]));
+ //TODO set a flag in cartridge definition to specify the default public IP or the interface
+ memberContext.setDefaultPublicIP(publicIPAddresses.iterator().next());
+ log.info("Retrieving public IP addresses: " + memberContext.toString());
} else {
- memberContext.setPublicIPs(new String[0]);
+ memberContext.setPublicIPs(new String[0]);
}
// private IPs
Set<String> privateIPAddresses = nodeMetadata.getPrivateAddresses();
if (privateIPAddresses != null && !privateIPAddresses.isEmpty()) {
- memberContext.setPrivateIPs(privateIPAddresses.toArray(new String[privateIPAddresses.size()]));
- //TODO set a flag in cartridge definition to specify the default private IP or the interface
- memberContext.setDefaultPrivateIP(privateIPAddresses.iterator().next());
- log.info("Retrieving private IP addresses " + memberContext.toString());
+ memberContext.setPrivateIPs(privateIPAddresses.toArray(new String[privateIPAddresses.size()]));
+ //TODO set a flag in cartridge definition to specify the default private IP or the interface
+ memberContext.setDefaultPrivateIP(privateIPAddresses.iterator().next());
+ log.info("Retrieving private IP addresses " + memberContext.toString());
} else {
- memberContext.setPrivateIPs(new String[0]);
+ memberContext.setPrivateIPs(new String[0]);
}
if (log.isDebugEnabled()) {
@@ -288,7 +291,7 @@ public abstract class JcloudsIaas extends Iaas {
String nodeId = memberContext.getInstanceId();
Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Starting to terminate member: [cartridge-type] %s [member-id] %s",
cartridgeType, memberId));
}
@@ -334,9 +337,9 @@ public abstract class JcloudsIaas extends Iaas {
// releasing all allocated IPs
if (memberContext.getAllocatedIPs() != null) {
- for (String allocatedIP : memberContext.getAllocatedIPs()) {
- releaseAddress(allocatedIP);
- }
+ for (String allocatedIP : memberContext.getAllocatedIPs()) {
+ releaseAddress(allocatedIP);
+ }
}
if (log.isInfoEnabled()) {
@@ -355,7 +358,7 @@ public abstract class JcloudsIaas extends Iaas {
return;
}
detachVolume(ctxt.getInstanceId(), volumeId);
- if(volume.isRemoveOntermination()){
+ if (volume.isRemoveOntermination()) {
deleteVolume(volumeId);
}
} catch (ResourceNotFoundException ignore) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaasUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaasUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaasUtil.java
index 7d8e47c..c8d3b19 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaasUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaasUtil.java
@@ -33,7 +33,7 @@ public class JcloudsIaasUtil {
private static final Log log = LogFactory.getLog(JcloudsIaasUtil.class);
public static void buildComputeServiceAndTemplate(IaasProvider iaasProvider) throws InvalidIaasProviderException {
- if(iaasProvider.getImage() != null) {
+ if (iaasProvider.getImage() != null) {
buildComputeServiceAndTemplateFromImage(iaasProvider);
} else {
buildDefaultComputeService(iaasProvider);
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/PartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/PartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/PartitionValidator.java
index cb7765a..b97cb43 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/PartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/PartitionValidator.java
@@ -31,15 +31,15 @@ public interface PartitionValidator {
/**
* set the IaasProvider reference.
- *
+ *
* @param iaasProvider {@link IaasProvider}
*/
public abstract void setIaasProvider(IaasProvider iaasProvider);
/**
* Validate the given properties for its existent in this partition.
- *
- * @param partition partition.
+ *
+ * @param partition partition.
* @param properties set of properties to be validated.
* @return cloned and modified {@link IaasProvider} which maps to the given partition.
* @throws InvalidPartitionException if at least one property is evaluated to be invalid.
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
index 83973e0..2c5ceff 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
@@ -56,21 +56,21 @@ import java.util.concurrent.TimeUnit;
*
* @scr.component name="org.apache.stratos.cloud.controller" immediate="true"
* @scr.reference name="hazelcast.instance.service" interface="com.hazelcast.core.HazelcastInstance"
- * cardinality="0..1"policy="dynamic" bind="setHazelcastInstance" unbind="unsetHazelcastInstance"
+ * cardinality="0..1"policy="dynamic" bind="setHazelcastInstance" unbind="unsetHazelcastInstance"
* @scr.reference name="distributedObjectProvider" interface="org.apache.stratos.common.services.DistributedObjectProvider"
- * cardinality="1..1" policy="dynamic" bind="setDistributedObjectProvider" unbind="unsetDistributedObjectProvider"
+ * cardinality="1..1" policy="dynamic" bind="setDistributedObjectProvider" unbind="unsetDistributedObjectProvider"
* @scr.reference name="componentStartUpSynchronizer" interface="org.apache.stratos.common.services.ComponentStartUpSynchronizer"
- * cardinality="1..1" policy="dynamic" bind="setComponentStartUpSynchronizer" unbind="unsetComponentStartUpSynchronizer"
+ * cardinality="1..1" policy="dynamic" bind="setComponentStartUpSynchronizer" unbind="unsetComponentStartUpSynchronizer"
* @scr.reference name="ntask.component" interface="org.wso2.carbon.ntask.core.service.TaskService"
- * cardinality="1..1" policy="dynamic" bind="setTaskService" unbind="unsetTaskService"
+ * cardinality="1..1" policy="dynamic" bind="setTaskService" unbind="unsetTaskService"
* @scr.reference name="registry.service" interface="org.wso2.carbon.registry.core.service.RegistryService"
- * cardinality="1..1" policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
+ * cardinality="1..1" policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
* @scr.reference name="config.context.service" interface="org.wso2.carbon.utils.ConfigurationContextService"
- * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" unbind="unsetConfigurationContextService"
+ * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" unbind="unsetConfigurationContextService"
*/
public class CloudControllerServiceComponent {
- private static final Log log = LogFactory.getLog(CloudControllerServiceComponent.class);
+ private static final Log log = LogFactory.getLog(CloudControllerServiceComponent.class);
private static final String CLOUD_CONTROLLER_COORDINATOR_LOCK = "cloud.controller.coordinator.lock";
private static final String THREAD_POOL_ID = "cloud.controller.thread.pool";
@@ -78,14 +78,14 @@ public class CloudControllerServiceComponent {
private static final int THREAD_POOL_SIZE = 10;
private static final int SCHEDULER_THREAD_POOL_SIZE = 5;
- private ClusterStatusTopicReceiver clusterStatusTopicReceiver;
- private InstanceStatusTopicReceiver instanceStatusTopicReceiver;
- private ApplicationEventReceiver applicationEventReceiver;
+ private ClusterStatusTopicReceiver clusterStatusTopicReceiver;
+ private InstanceStatusTopicReceiver instanceStatusTopicReceiver;
+ private ApplicationEventReceiver applicationEventReceiver;
private ExecutorService executorService;
private ScheduledExecutorService scheduler;
protected void activate(final ComponentContext context) {
- try {
+ try {
executorService = StratosThreadPool.getExecutorService(THREAD_POOL_ID, THREAD_POOL_SIZE);
scheduler = StratosThreadPool.getScheduledExecutorService(SCHEDULER_THREAD_POOL_ID,
SCHEDULER_THREAD_POOL_SIZE);
@@ -102,7 +102,7 @@ public class CloudControllerServiceComponent {
bundleContext.registerService(CloudControllerService.class.getName(),
new CloudControllerServiceImpl(), null);
- if(CloudControllerContext.getInstance().isClustered()) {
+ if (CloudControllerContext.getInstance().isClustered()) {
Thread coordinatorElectorThread = new Thread() {
@Override
public void run() {
@@ -134,8 +134,8 @@ public class CloudControllerServiceComponent {
};
Thread cloudControllerActivatorThread = new Thread(cloudControllerActivator);
cloudControllerActivatorThread.start();
- } catch (Exception e) {
- log.error("Could not activate cloud controller service component", e);
+ } catch (Exception e) {
+ log.error("Could not activate cloud controller service component", e);
}
}
@@ -173,7 +173,7 @@ public class CloudControllerServiceComponent {
componentStartUpSynchronizer.addEventListener(new ComponentActivationEventListener() {
@Override
public void activated(Component component) {
- if(component == Component.StratosManager) {
+ if (component == Component.StratosManager) {
Runnable topologySynchronizer = new TopologyEventSynchronizer();
scheduler.scheduleAtFixedRate(topologySynchronizer, 0, 1, TimeUnit.MINUTES);
}
@@ -195,29 +195,29 @@ public class CloudControllerServiceComponent {
ServiceReferenceHolder.getInstance().setTaskService(null);
}
- protected void setRegistryService(RegistryService registryService) {
- if (log.isDebugEnabled()) {
- log.debug("Setting the Registry Service");
- }
+ protected void setRegistryService(RegistryService registryService) {
+ if (log.isDebugEnabled()) {
+ log.debug("Setting the Registry Service");
+ }
- try {
- UserRegistry registry = registryService.getGovernanceSystemRegistry();
- ServiceReferenceHolder.getInstance().setRegistry(registry);
+ try {
+ UserRegistry registry = registryService.getGovernanceSystemRegistry();
+ ServiceReferenceHolder.getInstance().setRegistry(registry);
} catch (RegistryException e) {
- String msg = "Failed when retrieving Governance System Registry.";
- log.error(msg, e);
- throw new CloudControllerException(msg, e);
+ String msg = "Failed when retrieving Governance System Registry.";
+ log.error(msg, e);
+ throw new CloudControllerException(msg, e);
}
- }
+ }
- protected void unsetRegistryService(RegistryService registryService) {
- if (log.isDebugEnabled()) {
+ protected void unsetRegistryService(RegistryService registryService) {
+ if (log.isDebugEnabled()) {
log.debug("Un-setting the Registry Service");
}
ServiceReferenceHolder.getInstance().setRegistry(null);
- }
+ }
- protected void setConfigurationContextService(ConfigurationContextService cfgCtxService) {
+ protected void setConfigurationContextService(ConfigurationContextService cfgCtxService) {
ServiceReferenceHolder.getInstance().setAxisConfiguration(
cfgCtxService.getServerConfigContext().getAxisConfiguration());
}
@@ -250,7 +250,7 @@ public class CloudControllerServiceComponent {
ServiceReferenceHolder.getInstance().setComponentStartUpSynchronizer(null);
}
- protected void deactivate(ComponentContext ctx) {
+ protected void deactivate(ComponentContext ctx) {
// Close event publisher connections to message broker
try {
EventPublisherPool.close(MessagingUtil.Topics.TOPOLOGY_TOPIC.getTopicName());
@@ -263,18 +263,18 @@ public class CloudControllerServiceComponent {
// Shutdown scheduler
shutdownScheduledExecutorService(SCHEDULER_THREAD_POOL_ID);
- }
+ }
private void shutdownExecutorService(String executorServiceId) {
ExecutorService executorService = StratosThreadPool.getExecutorService(executorServiceId, 1);
- if(executorService != null) {
+ if (executorService != null) {
shutdownExecutorService(executorService);
}
}
private void shutdownScheduledExecutorService(String executorServiceId) {
ExecutorService executorService = StratosThreadPool.getScheduledExecutorService(executorServiceId, 1);
- if(executorService != null) {
+ if (executorService != null) {
shutdownExecutorService(executorService);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
index f26bd79..bd3485f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
@@ -46,22 +46,22 @@ public class ServiceReferenceHolder {
public static ServiceReferenceHolder getInstance() {
if (instance == null) {
synchronized (ServiceReferenceHolder.class) {
- if(instance == null) {
+ if (instance == null) {
instance = new ServiceReferenceHolder();
}
}
}
return instance;
}
-
+
public void setAxisConfiguration(AxisConfiguration axisConfiguration) {
this.axisConfiguration = axisConfiguration;
}
-
+
public AxisConfiguration getAxisConfiguration() {
return axisConfiguration;
}
-
+
public TaskService getTaskService() {
return taskService;
}
@@ -69,13 +69,13 @@ public class ServiceReferenceHolder {
public void setTaskService(TaskService taskService) {
this.taskService = taskService;
}
-
- public void setRegistry(UserRegistry governanceSystemRegistry) {
- registry = governanceSystemRegistry;
+
+ public void setRegistry(UserRegistry governanceSystemRegistry) {
+ registry = governanceSystemRegistry;
}
- public Registry getRegistry() {
- return registry;
+ public Registry getRegistry() {
+ return registry;
}
public void setDistributedObjectProvider(DistributedObjectProvider distributedObjectProvider) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
index 01648b1..e7360bc 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
@@ -45,7 +45,7 @@ public class RegistryManager {
public static RegistryManager getInstance() {
return instance;
}
-
+
private RegistryManager() {
}
@@ -55,7 +55,7 @@ public class RegistryManager {
* @param serializableObject object to be persisted.
*/
public synchronized void persist(String resourcePath, Serializable serializableObject) throws RegistryException {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Persisting resource in registry: [resource-path] %s", resourcePath));
}
@@ -63,8 +63,8 @@ public class RegistryManager {
try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
- ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+ ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+ ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
registry.beginTransaction();
@@ -74,7 +74,7 @@ public class RegistryManager {
registry.commitTransaction();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Resource persisted successfully in registry: [resource-path] %s",
resourcePath));
}
@@ -88,6 +88,7 @@ public class RegistryManager {
/**
* Returns an object stored in the given resource path.
+ *
* @param resourcePath
* @return
* @throws org.wso2.carbon.registry.core.exceptions.RegistryException
@@ -97,8 +98,8 @@ public class RegistryManager {
Registry registry = getRegistry();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
- ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+ ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+ ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
Resource resource = registry.get(resourcePath);
Object content = resource.getContent();
if ((content != null) && (content instanceof byte[])) {
@@ -119,7 +120,7 @@ public class RegistryManager {
}
}
- public synchronized void remove(String resourcePath) throws RegistryException{
+ public synchronized void remove(String resourcePath) throws RegistryException {
Registry registry = getRegistry();
try {
@@ -144,11 +145,12 @@ public class RegistryManager {
/**
* Serialize an object to a byte array.
+ *
* @param serializableObject
* @return
* @throws java.io.IOException
*/
- private byte[] serializeToByteArray(Serializable serializableObject) throws IOException {
+ private byte[] serializeToByteArray(Serializable serializableObject) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutput out = null;
@@ -168,6 +170,7 @@ public class RegistryManager {
/**
* Deserialize a byte array and retrieve the object.
+ *
* @param bytes bytes to be deserialized
* @return the deserialized {@link Object}
* @throws Exception if the deserialization is failed.
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
index 52a3727..83584d5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
@@ -28,347 +28,351 @@ import org.apache.stratos.messaging.domain.topology.ClusterStatus;
/**
* This API provides a way to communicate with underline
* Infrastructure which are supported by <i>jClouds</i>.
- *
*/
public interface CloudControllerService {
- /**
- * Add a cartridge
- *
- * @param cartridgeConfig cartridge configuration to be deployed
- * @throws InvalidCartridgeDefinitionException if the cartridge configuration is not valid.
- * @throws InvalidIaasProviderException if the iaas providers configured are not valid.
- * @throws IllegalArgumentException if the provided argument is not valid.
- */
- void addCartridge(Cartridge cartridgeConfig)
- throws InvalidCartridgeDefinitionException, InvalidIaasProviderException, CartridgeAlreadyExistsException;
-
- /**
- * Update a cartridge
- *
- * @param cartridgeConfig
- * @throws InvalidCartridgeDefinitionException
- * @throws InvalidIaasProviderException
- * @throws org.apache.stratos.cloud.controller.exception.CartridgeDefinitionNotExistsException
- */
- public void updateCartridge(Cartridge cartridgeConfig) throws InvalidCartridgeDefinitionException,
- InvalidIaasProviderException,
- CartridgeDefinitionNotExistsException;
-
- /**
- * Remove a cartridge
- *
- * @param cartridgeType type of the cartridge to be undeployed.
- * @throws InvalidCartridgeTypeException if the cartridge type specified is not a deployed cartridge.
- */
- public void removeCartridge(String cartridgeType) throws InvalidCartridgeTypeException;
-
- /**
- * Add a cartridge group
- *
- * @param servicegroup
- * @throws InvalidServiceGroupException
- */
- public void addServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException;
-
- /**
- * Remove a cartridge group
- *
- * @param name
- * @throws InvalidServiceGroupException
- */
- public void removeServiceGroup(String name) throws InvalidServiceGroupException;
-
- /**
- * Get cartridge group
- *
- * @param groupName
- * @return
- * @throws InvalidServiceGroupException
- */
- public ServiceGroup getServiceGroup(String groupName) throws InvalidServiceGroupException;
-
- /**
- * Get cartridge group sub group
- *
- * @param groupName
- * @return
- * @throws InvalidServiceGroupException
- */
- public String[] getServiceGroupSubGroups(String groupName) throws InvalidServiceGroupException;
-
- /**
- * Get cartridges of a cartridge group
- *
- * @param groupName
- * @return
- * @throws InvalidServiceGroupException
- */
- public String[] getServiceGroupCartridges(String groupName) throws InvalidServiceGroupException;
-
- /**
- * Get cartridge group dependencies
- *
- * @param groupName
- * @return
- * @throws InvalidServiceGroupException
- */
- public Dependencies getServiceGroupDependencies(String groupName) throws InvalidServiceGroupException;
-
- /**
- * Validate a given {@link Partition} for basic property existence.
- *
- * @param partition partition to be validated.
- * @return whether the partition is a valid one.
- * @throws InvalidPartitionException if the partition is invalid.
- */
- boolean validatePartition(Partition partition) throws InvalidPartitionException;
-
- /**
- * Validate a given deployment policy
- *
- * @param cartridgeType type of the cartridge
- * @param networkPartitionId id of network partition to be validated
- * @return whether the policy is a valid one against the given Cartridge.
- * @throws InvalidPartitionException if the policy contains at least one invalid partition.
- * @throws InvalidCartridgeTypeException if the given Cartridge type is not a valid one.
- */
- boolean validateDeploymentPolicyNetworkPartition(String cartridgeType, String networkPartitionId)
- throws InvalidPartitionException, InvalidCartridgeTypeException;
-
- /**
- * <p>
- * Registers the details of a newly created service cluster. This will override an already
- * present service cluster, if there is any. A service cluster is uniquely identified by its
- * domain and sub domain combination.
- * </p>
- *
- * @param registrant information about the new subscription.
- * @return whether the registration is successful or not.
- * @throws org.apache.stratos.cloud.controller.exception.CartridgeNotFoundException when the cartridge type
- * requested by this service is
- * not a registered one.
- */
- boolean registerService(Registrant registrant) throws CartridgeNotFoundException;
-
- /**
- * Start instances with the given instance contexts. Instances startup process will run in background and
- * this method will return with the relevant member contexts.
- *
- * @param instanceContexts An array of instance contexts
- * @return member contexts
- * @throws org.apache.stratos.cloud.controller.exception.CartridgeNotFoundException if the requested Cartridge
- * type is not a registered one.
- * @throws org.apache.stratos.cloud.controller.exception.InvalidIaasProviderException if the iaas requested is not
- * valid.
- */
- MemberContext[] startInstances(InstanceContext[] instanceContexts) throws CartridgeNotFoundException,
- InvalidIaasProviderException,
- CloudControllerException;
-
- /**
- * Calling this method will result in termination of the instance with given member id in the given Partition.
- *
- * @param memberId member ID of the instance to be terminated.
- * @return whether an instance terminated successfully or not.
- */
- void terminateInstance(String memberId) throws InvalidMemberException, InvalidCartridgeTypeException,
- CloudControllerException;
-
- void terminateInstanceForcefully(String memberId) throws InvalidCartridgeTypeException;
-
- /**
- * Calling this method will result in termination of all instances belong
- * to the provided cluster ID.
- *
- * @param clusterId cluster ID of the instance to be terminated.
- * @return whether an instance terminated successfully or not.
- */
- void terminateInstances(String clusterId) throws InvalidClusterException;
-
- /**
- * Update the topology with current cluster status.
- *
- * @param serviceName id of service which the cluster belongs to.
- * @param clusterId id of the subjected cluster.
- * @param instanceId id of the cluster instance.
- * @param status total number of replicas to be set to the controller.
- */
- void updateClusterStatus(String serviceName, String clusterId, String instanceId, ClusterStatus status);
-
- /**
- * Unregister the service cluster identified by the given cluster id.
- *
- * @param clusterId service cluster id.
- * @throws UnregisteredClusterException if the service cluster requested is not a registered one.
- */
- void unregisterService(String clusterId) throws UnregisteredClusterException;
-
- /**
- * This method will return the information regarding the given cartridge, if present.
- * Else this will return <code>null</code>.
- *
- * @param cartridgeType type of the cartridge.
- * @return {@link org.apache.stratos.cloud.controller.domain.Cartridge} of the given cartridge type or
- * <code>null</code>.
- * @throws org.apache.stratos.cloud.controller.exception.CartridgeNotFoundException if there is no registered
- * cartridge with this type.
- */
- Cartridge getCartridge(String cartridgeType) throws CartridgeNotFoundException;
-
- /**
- * Calling this method will result in returning the types of {@link org.apache.stratos.cloud.controller.domain
- * .Cartridge}s
- * registered in Cloud Controller.
- *
- * @return String array containing types of registered {@link org.apache.stratos.cloud.controller.domain.Cartridge}s.
- */
- String[] getCartridges();
-
- /**
- * Returns the {@link org.apache.stratos.cloud.controller.domain.ClusterContext} object associated with the given cluster id, or null if not found
- *
- * @param clusterId cluster id
- * @return {@link org.apache.stratos.cloud.controller.domain.ClusterContext} object associated with the given cluster id, or null
- */
- public ClusterContext getClusterContext(String clusterId);
-
- /**
- * Creates the clusters relevant to an application in the topology model
- *
- * @param appId application id
- * @param appClustersContexts cluster information holder object
- * @throws ApplicationClusterRegistrationException if the cluster information are null/empty
- */
- public void createApplicationClusters(String appId, ApplicationClusterContext[] appClustersContexts) throws
- ApplicationClusterRegistrationException;
-
- /**
- * Creates a cluster instance with the given information
- *
- * @param serviceType serviceType
- * @param clusterId cluster id
- * @param alias alias provided in the subscription parameters
- * @param instanceId instance id
- * @throws ClusterInstanceCreationException if an y error occurs in cluster instance creation
- */
- public void createClusterInstance(String serviceType, String clusterId, String alias,
- String instanceId, String partitionId,
- String networkPartitionId) throws
- ClusterInstanceCreationException;
-
- /**
- * Retrieves registered Kubernetes clusters.
- */
- public KubernetesCluster[] getKubernetesClusters();
-
- /**
- * Retrieves Kubernetes cluster for given Kubernetes cluster ID.
- *
- * @param kubernetesClusterId
- */
- public KubernetesCluster getKubernetesCluster(String kubernetesClusterId)
- throws NonExistingKubernetesClusterException;
-
- /**
- * Retrieves Kubernetes Master for given Kubernetes cluster ID.
- *
- * @param kubernetesClusterId
- */
- public KubernetesMaster getMasterForKubernetesCluster(String kubernetesClusterId)
- throws NonExistingKubernetesClusterException;
-
- /**
- * Retrieves Kubernetes Hosts for given Kubernetes cluster ID.
- *
- * @param kubernetesClusterId
- */
- public KubernetesHost[] getHostsForKubernetesCluster(String kubernetesClusterId)
- throws NonExistingKubernetesClusterException;
-
- /**
- * Register a Kubernetes cluster.
- *
- * @param kubernetesCluster
- * @throws org.apache.stratos.cloud.controller.exception.InvalidKubernetesClusterException
- */
- public boolean addKubernetesCluster(KubernetesCluster kubernetesCluster) throws InvalidKubernetesClusterException;
-
- /**
- * Add a Kubernetes host to a Kubernetes cluster.
- *
- * @param groupId
- * @param kubernetesHost
- * @throws org.apache.stratos.cloud.controller.exception.InvalidKubernetesHostException
- */
- public boolean addKubernetesHost(String groupId, KubernetesHost kubernetesHost) throws
- InvalidKubernetesHostException,
- NonExistingKubernetesClusterException;
-
- /**
- * Update a Kubernetes host.
- *
- * @param kubernetesHost
- * @throws InvalidKubernetesHostException
- */
- public boolean updateKubernetesHost(KubernetesHost kubernetesHost) throws
- InvalidKubernetesHostException,
- NonExistingKubernetesHostException;
-
- /**
- * Remove a Kubernetes host.
- *
- * @param groupId
- * @throws NonExistingKubernetesClusterException
- */
- public boolean removeKubernetesCluster(String groupId) throws NonExistingKubernetesClusterException;
-
- /**
- * Update a Kubernetes host.
- *
- * @param hostId
- * @throws InvalidKubernetesHostException
- */
- public boolean removeKubernetesHost(String hostId) throws NonExistingKubernetesHostException;
-
- /**
- * Update a Kubernetes Master in a Kubernetes cluster.
- *
- * @param kubernetesMaster
- * @throws NonExistingKubernetesMasterException
- */
- public boolean updateKubernetesMaster(KubernetesMaster kubernetesMaster)
- throws InvalidKubernetesMasterException, NonExistingKubernetesMasterException;
+ /**
+ * Add a cartridge
+ *
+ * @param cartridgeConfig cartridge configuration to be deployed
+ * @throws InvalidCartridgeDefinitionException if the cartridge configuration is not valid.
+ * @throws InvalidIaasProviderException if the iaas providers configured are not valid.
+ * @throws IllegalArgumentException if the provided argument is not valid.
+ */
+ void addCartridge(Cartridge cartridgeConfig)
+ throws InvalidCartridgeDefinitionException, InvalidIaasProviderException, CartridgeAlreadyExistsException;
+
+ /**
+ * Update a cartridge
+ *
+ * @param cartridgeConfig
+ * @throws InvalidCartridgeDefinitionException
+ * @throws InvalidIaasProviderException
+ * @throws org.apache.stratos.cloud.controller.exception.CartridgeDefinitionNotExistsException
+ */
+ public void updateCartridge(Cartridge cartridgeConfig) throws InvalidCartridgeDefinitionException,
+ InvalidIaasProviderException,
+ CartridgeDefinitionNotExistsException;
+
+ /**
+ * Remove a cartridge
+ *
+ * @param cartridgeType type of the cartridge to be undeployed.
+ * @throws InvalidCartridgeTypeException if the cartridge type specified is not a deployed cartridge.
+ */
+ public void removeCartridge(String cartridgeType) throws InvalidCartridgeTypeException;
+
+ /**
+ * Add a cartridge group
+ *
+ * @param servicegroup
+ * @throws InvalidServiceGroupException
+ */
+ public void addServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException;
+
+ /**
+ * Remove a cartridge group
+ *
+ * @param name
+ * @throws InvalidServiceGroupException
+ */
+ public void removeServiceGroup(String name) throws InvalidServiceGroupException;
+
+ /**
+ * Get cartridge group
+ *
+ * @param groupName
+ * @return
+ * @throws InvalidServiceGroupException
+ */
+ public ServiceGroup getServiceGroup(String groupName) throws InvalidServiceGroupException;
+
+ /**
+ * Get cartridge group sub group
+ *
+ * @param groupName
+ * @return
+ * @throws InvalidServiceGroupException
+ */
+ public String[] getServiceGroupSubGroups(String groupName) throws InvalidServiceGroupException;
+
+ /**
+ * Get cartridges of a cartridge group
+ *
+ * @param groupName
+ * @return
+ * @throws InvalidServiceGroupException
+ */
+ public String[] getServiceGroupCartridges(String groupName) throws InvalidServiceGroupException;
+
+ /**
+ * Get cartridge group dependencies
+ *
+ * @param groupName
+ * @return
+ * @throws InvalidServiceGroupException
+ */
+ public Dependencies getServiceGroupDependencies(String groupName) throws InvalidServiceGroupException;
+
+ /**
+ * Validate a given {@link Partition} for basic property existence.
+ *
+ * @param partition partition to be validated.
+ * @return whether the partition is a valid one.
+ * @throws InvalidPartitionException if the partition is invalid.
+ */
+ boolean validatePartition(Partition partition) throws InvalidPartitionException;
+
+ /**
+ * Validate a given deployment policy
+ *
+ * @param cartridgeType type of the cartridge
+ * @param networkPartitionId id of network partition to be validated
+ * @return whether the policy is a valid one against the given Cartridge.
+ * @throws InvalidPartitionException if the policy contains at least one invalid partition.
+ * @throws InvalidCartridgeTypeException if the given Cartridge type is not a valid one.
+ */
+ boolean validateDeploymentPolicyNetworkPartition(String cartridgeType, String networkPartitionId)
+ throws InvalidPartitionException, InvalidCartridgeTypeException;
+
+ /**
+ * <p>
+ * Registers the details of a newly created service cluster. This will override an already
+ * present service cluster, if there is any. A service cluster is uniquely identified by its
+ * domain and sub domain combination.
+ * </p>
+ *
+ * @param registrant information about the new subscription.
+ * @return whether the registration is successful or not.
+ * @throws org.apache.stratos.cloud.controller.exception.CartridgeNotFoundException when the cartridge type
+ * requested by this service is
+ * not a registered one.
+ */
+ boolean registerService(Registrant registrant) throws CartridgeNotFoundException;
+
+ /**
+ * Start instances with the given instance contexts. Instances startup process will run in background and
+ * this method will return with the relevant member contexts.
+ *
+ * @param instanceContexts An array of instance contexts
+ * @return member contexts
+ * @throws org.apache.stratos.cloud.controller.exception.CartridgeNotFoundException if the requested Cartridge
+ * type is not a registered one.
+ * @throws org.apache.stratos.cloud.controller.exception.InvalidIaasProviderException if the iaas requested is not
+ * valid.
+ */
+ MemberContext[] startInstances(InstanceContext[] instanceContexts) throws CartridgeNotFoundException,
+ InvalidIaasProviderException,
+ CloudControllerException;
+
+ /**
+ * Calling this method will result in termination of the instance with given member id in the given Partition.
+ *
+ * @param memberId member ID of the instance to be terminated.
+ * @return whether an instance terminated successfully or not.
+ */
+ void terminateInstance(String memberId) throws InvalidMemberException, InvalidCartridgeTypeException,
+ CloudControllerException;
+
+ void terminateInstanceForcefully(String memberId) throws InvalidCartridgeTypeException;
+
+ /**
+ * Calling this method will result in termination of all instances belong
+ * to the provided cluster ID.
+ *
+ * @param clusterId cluster ID of the instance to be terminated.
+ * @return whether an instance terminated successfully or not.
+ */
+ void terminateInstances(String clusterId) throws InvalidClusterException;
+
+ /**
+ * Update the topology with current cluster status.
+ *
+ * @param serviceName id of service which the cluster belongs to.
+ * @param clusterId id of the subjected cluster.
+ * @param instanceId id of the cluster instance.
+ * @param status total number of replicas to be set to the controller.
+ */
+ void updateClusterStatus(String serviceName, String clusterId, String instanceId, ClusterStatus status);
+
+ /**
+ * Unregister the service cluster identified by the given cluster id.
+ *
+ * @param clusterId service cluster id.
+ * @throws UnregisteredClusterException if the service cluster requested is not a registered one.
+ */
+ void unregisterService(String clusterId) throws UnregisteredClusterException;
+
+ /**
+ * This method will return the information regarding the given cartridge, if present.
+ * Else this will return <code>null</code>.
+ *
+ * @param cartridgeType type of the cartridge.
+ * @return {@link org.apache.stratos.cloud.controller.domain.Cartridge} of the given cartridge type or
+ * <code>null</code>.
+ * @throws org.apache.stratos.cloud.controller.exception.CartridgeNotFoundException if there is no registered
+ * cartridge with this type.
+ */
+ Cartridge getCartridge(String cartridgeType) throws CartridgeNotFoundException;
+
+ /**
+ * Calling this method will result in returning the types of {@link org.apache.stratos.cloud.controller.domain
+ * .Cartridge}s
+ * registered in Cloud Controller.
+ *
+ * @return String array containing types of registered {@link org.apache.stratos.cloud.controller.domain.Cartridge}s.
+ */
+ String[] getCartridges();
+
+ /**
+ * Returns the {@link org.apache.stratos.cloud.controller.domain.ClusterContext} object associated with the given cluster id, or null if not found
+ *
+ * @param clusterId cluster id
+ * @return {@link org.apache.stratos.cloud.controller.domain.ClusterContext} object associated with the given cluster id, or null
+ */
+ public ClusterContext getClusterContext(String clusterId);
+
+ /**
+ * Creates the clusters relevant to an application in the topology model
+ *
+ * @param appId application id
+ * @param appClustersContexts cluster information holder object
+ * @throws ApplicationClusterRegistrationException if the cluster information are null/empty
+ */
+ public void createApplicationClusters(String appId, ApplicationClusterContext[] appClustersContexts) throws
+ ApplicationClusterRegistrationException;
+
+ /**
+ * Creates a cluster instance with the given information
+ *
+ * @param serviceType serviceType
+ * @param clusterId cluster id
+ * @param alias alias provided in the subscription parameters
+ * @param instanceId instance id
+ * @throws ClusterInstanceCreationException if an y error occurs in cluster instance creation
+ */
+ public void createClusterInstance(String serviceType, String clusterId, String alias,
+ String instanceId, String partitionId,
+ String networkPartitionId) throws
+ ClusterInstanceCreationException;
+
+ /**
+ * Retrieves registered Kubernetes clusters.
+ */
+ public KubernetesCluster[] getKubernetesClusters();
+
+ /**
+ * Retrieves Kubernetes cluster for given Kubernetes cluster ID.
+ *
+ * @param kubernetesClusterId
+ */
+ public KubernetesCluster getKubernetesCluster(String kubernetesClusterId)
+ throws NonExistingKubernetesClusterException;
+
+ /**
+ * Retrieves Kubernetes Master for given Kubernetes cluster ID.
+ *
+ * @param kubernetesClusterId
+ */
+ public KubernetesMaster getMasterForKubernetesCluster(String kubernetesClusterId)
+ throws NonExistingKubernetesClusterException;
+
+ /**
+ * Retrieves Kubernetes Hosts for given Kubernetes cluster ID.
+ *
+ * @param kubernetesClusterId
+ */
+ public KubernetesHost[] getHostsForKubernetesCluster(String kubernetesClusterId)
+ throws NonExistingKubernetesClusterException;
+
+ /**
+ * Register a Kubernetes cluster.
+ *
+ * @param kubernetesCluster
+ * @throws org.apache.stratos.cloud.controller.exception.InvalidKubernetesClusterException
+ */
+ public boolean addKubernetesCluster(KubernetesCluster kubernetesCluster) throws InvalidKubernetesClusterException;
+
+ /**
+ * Add a Kubernetes host to a Kubernetes cluster.
+ *
+ * @param groupId
+ * @param kubernetesHost
+ * @throws org.apache.stratos.cloud.controller.exception.InvalidKubernetesHostException
+ */
+ public boolean addKubernetesHost(String groupId, KubernetesHost kubernetesHost) throws
+ InvalidKubernetesHostException,
+ NonExistingKubernetesClusterException;
+
+ /**
+ * Update a Kubernetes host.
+ *
+ * @param kubernetesHost
+ * @throws InvalidKubernetesHostException
+ */
+ public boolean updateKubernetesHost(KubernetesHost kubernetesHost) throws
+ InvalidKubernetesHostException,
+ NonExistingKubernetesHostException;
+
+ /**
+ * Remove a Kubernetes host.
+ *
+ * @param groupId
+ * @throws NonExistingKubernetesClusterException
+ */
+ public boolean removeKubernetesCluster(String groupId) throws NonExistingKubernetesClusterException;
+
+ /**
+ * Update a Kubernetes host.
+ *
+ * @param hostId
+ * @throws InvalidKubernetesHostException
+ */
+ public boolean removeKubernetesHost(String hostId) throws NonExistingKubernetesHostException;
+
+ /**
+ * Update a Kubernetes Master in a Kubernetes cluster.
+ *
+ * @param kubernetesMaster
+ * @throws NonExistingKubernetesMasterException
+ */
+ public boolean updateKubernetesMaster(KubernetesMaster kubernetesMaster)
+ throws InvalidKubernetesMasterException, NonExistingKubernetesMasterException;
/**
* Add network partition
+ *
* @param networkPartition
- * @throws NetworkPartitionAlreadyExistsException
+ * @throws NetworkPartitionAlreadyExistsException
*/
public void addNetworkPartition(NetworkPartition networkPartition) throws NetworkPartitionAlreadyExistsException;
/**
* Remove network partition
+ *
* @param networkPartitionId
- * @throws NetworkPartitionNotExistsException
+ * @throws NetworkPartitionNotExistsException
*/
public void removeNetworkPartition(String networkPartitionId) throws NetworkPartitionNotExistsException;
/**
* Update network partition
+ *
* @param networkPartition
- * @throws NetworkPartitionNotExistsException
+ * @throws NetworkPartitionNotExistsException
*/
public void updateNetworkPartition(NetworkPartition networkPartition) throws NetworkPartitionNotExistsException;
/**
* Get network partitions
+ *
* @return
*/
public NetworkPartition[] getNetworkPartitions();
/**
* Get network partition by network partition id
+ *
* @param networkPartitionId
* @return
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index 4c248a0..19e589d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -24,281 +24,281 @@ import java.io.File;
public final class CloudControllerConstants {
- /**
- * cloud-controller XML file's elements
- */
- public static final String CLOUD_CONTROLLER_ELEMENT = "cloudController";
- public static final String SERIALIZATION_DIR_ELEMENT = "serializationDir";
- public static final String IAAS_PROVIDERS_ELEMENT = "iaasProviders";
- public static final String IAAS_PROVIDER_ELEMENT = "iaasProvider";
- public static final String PARTITION_ELEMENT = "partition";
- public static final String PARTITIONS_ELEMENT = "partitions";
- public static final String REGION_ELEMENT = "region";
- public static final String ZONE_ELEMENT = "zone";
- public static final String DEPLOYMENT_ELEMENT = "deployment";
- public static final String PORT_MAPPING_ELEMENT = "portMapping";
- public static final String APP_TYPES_ELEMENT = "appTypes";
- public static final String TYPE_ATTR = "type";
- public static final String HOST_ATTR = "host";
- public static final String BASE_DIR_ATTR = "baseDir";
- public static final String PROVIDER_ATTR = "provider";
- public static final String VERSION_ATTR = "version";
- public static final String MULTI_TENANT_ATTR = "multiTenant";
- public static final String PORT_ATTR = "port";
- public static final String PROXY_PORT_ATTR = "proxyPort";
- public static final String NAME_ATTR = "name";
- public static final String APP_SPECIFIC_MAPPING_ATTR = "appSpecificMapping";
+ /**
+ * cloud-controller XML file's elements
+ */
+ public static final String CLOUD_CONTROLLER_ELEMENT = "cloudController";
+ public static final String SERIALIZATION_DIR_ELEMENT = "serializationDir";
+ public static final String IAAS_PROVIDERS_ELEMENT = "iaasProviders";
+ public static final String IAAS_PROVIDER_ELEMENT = "iaasProvider";
+ public static final String PARTITION_ELEMENT = "partition";
+ public static final String PARTITIONS_ELEMENT = "partitions";
+ public static final String REGION_ELEMENT = "region";
+ public static final String ZONE_ELEMENT = "zone";
+ public static final String DEPLOYMENT_ELEMENT = "deployment";
+ public static final String PORT_MAPPING_ELEMENT = "portMapping";
+ public static final String APP_TYPES_ELEMENT = "appTypes";
+ public static final String TYPE_ATTR = "type";
+ public static final String HOST_ATTR = "host";
+ public static final String BASE_DIR_ATTR = "baseDir";
+ public static final String PROVIDER_ATTR = "provider";
+ public static final String VERSION_ATTR = "version";
+ public static final String MULTI_TENANT_ATTR = "multiTenant";
+ public static final String PORT_ATTR = "port";
+ public static final String PROXY_PORT_ATTR = "proxyPort";
+ public static final String NAME_ATTR = "name";
+ public static final String APP_SPECIFIC_MAPPING_ATTR = "appSpecificMapping";
- public static final String CARTRIDGES_ELEMENT = "cartridges";
- public static final String CARTRIDGE_ELEMENT = "cartridge";
+ public static final String CARTRIDGES_ELEMENT = "cartridges";
+ public static final String CARTRIDGE_ELEMENT = "cartridge";
- public static final String DISPLAY_NAME_ELEMENT = "displayName";
- public static final String DESCRIPTION_ELEMENT = "description";
- public static final String PROPERTY_ELEMENT = "property";
- public static final String PROPERTY_NAME_ATTR = "name";
- public static final String PROPERTY_VALUE_ATTR = "value";
- public static final String IMAGE_ID_ELEMENT = "imageId";
- public static final String SCALE_DOWN_ORDER_ELEMENT = "scaleDownOrder";
- public static final String SCALE_UP_ORDER_ELEMENT = "scaleUpOrder";
- public static final String CLASS_NAME_ELEMENT = "className";
- public static final String PROVIDER_ELEMENT = "provider";
- public static final String IDENTITY_ELEMENT = "identity";
- public static final String TYPE_ELEMENT = "type";
- public static final String SCOPE_ELEMENT = "scope";
- public static final String ID_ELEMENT = "id";
- public static final String CREDENTIAL_ELEMENT = "credential";
- public static final String DEFAULT_SERVICE_ELEMENT = "default";
- public static final String SERVICE_ELEMENT = "service";
- public static final String SERVICES_ELEMENT = "services";
- public static final String DIRECTORY_ELEMENT = "dir";
- public static final String HTTP_ELEMENT = "http";
- public static final String HTTPS_ELEMENT = "https";
- public static final String APP_TYPE_ELEMENT = "appType";
- public static final String SERVICE_DOMAIN_ATTR = "domain";
- public static final String SERVICE_SUB_DOMAIN_ATTR = "subDomain";
- public static final String SERVICE_TENANT_RANGE_ATTR = "tenantRange";
- public static final String POLICY_NAME = "policyName";
- public static final String PAYLOAD_ELEMENT = "payload";
- public static final String DATA_PUBLISHER_ELEMENT = "dataPublisher";
- public static final String TOPOLOGY_SYNC_ELEMENT = "topologySync";
- public static final String ENABLE_ATTR = "enable";
- public static final String BAM_SERVER_ELEMENT = "bamServer";
- public static final String CRON_ELEMENT = "cron";
- public static final String BAM_SERVER_ADMIN_USERNAME_ELEMENT = "adminUserName";
- public static final String BAM_SERVER_ADMIN_PASSWORD_ELEMENT = "adminPassword";
- public static final String CASSANDRA_INFO_ELEMENT = "cassandraInfo";
- public static final String HOST_ELEMENT = "host";
- public static final String CONNECTION_URL_ELEMENT = "connectionUrl";
- public static final String HOST_PORT_ELEMENT = "port";
- public static final String USER_NAME_ELEMENT = "userName";
- public static final String PASSWORD_ELEMENT = "password";
- public static final String CLOUD_CONTROLLER_EVENT_STREAM = "org.apache.stratos.cloud.controller";
- public static final String CLOUD_CONTROLLER_COL_FAMILY = CLOUD_CONTROLLER_EVENT_STREAM
- .replaceAll("[/.]", "_");
+ public static final String DISPLAY_NAME_ELEMENT = "displayName";
+ public static final String DESCRIPTION_ELEMENT = "description";
+ public static final String PROPERTY_ELEMENT = "property";
+ public static final String PROPERTY_NAME_ATTR = "name";
+ public static final String PROPERTY_VALUE_ATTR = "value";
+ public static final String IMAGE_ID_ELEMENT = "imageId";
+ public static final String SCALE_DOWN_ORDER_ELEMENT = "scaleDownOrder";
+ public static final String SCALE_UP_ORDER_ELEMENT = "scaleUpOrder";
+ public static final String CLASS_NAME_ELEMENT = "className";
+ public static final String PROVIDER_ELEMENT = "provider";
+ public static final String IDENTITY_ELEMENT = "identity";
+ public static final String TYPE_ELEMENT = "type";
+ public static final String SCOPE_ELEMENT = "scope";
+ public static final String ID_ELEMENT = "id";
+ public static final String CREDENTIAL_ELEMENT = "credential";
+ public static final String DEFAULT_SERVICE_ELEMENT = "default";
+ public static final String SERVICE_ELEMENT = "service";
+ public static final String SERVICES_ELEMENT = "services";
+ public static final String DIRECTORY_ELEMENT = "dir";
+ public static final String HTTP_ELEMENT = "http";
+ public static final String HTTPS_ELEMENT = "https";
+ public static final String APP_TYPE_ELEMENT = "appType";
+ public static final String SERVICE_DOMAIN_ATTR = "domain";
+ public static final String SERVICE_SUB_DOMAIN_ATTR = "subDomain";
+ public static final String SERVICE_TENANT_RANGE_ATTR = "tenantRange";
+ public static final String POLICY_NAME = "policyName";
+ public static final String PAYLOAD_ELEMENT = "payload";
+ public static final String DATA_PUBLISHER_ELEMENT = "dataPublisher";
+ public static final String TOPOLOGY_SYNC_ELEMENT = "topologySync";
+ public static final String ENABLE_ATTR = "enable";
+ public static final String BAM_SERVER_ELEMENT = "bamServer";
+ public static final String CRON_ELEMENT = "cron";
+ public static final String BAM_SERVER_ADMIN_USERNAME_ELEMENT = "adminUserName";
+ public static final String BAM_SERVER_ADMIN_PASSWORD_ELEMENT = "adminPassword";
+ public static final String CASSANDRA_INFO_ELEMENT = "cassandraInfo";
+ public static final String HOST_ELEMENT = "host";
+ public static final String CONNECTION_URL_ELEMENT = "connectionUrl";
+ public static final String HOST_PORT_ELEMENT = "port";
+ public static final String USER_NAME_ELEMENT = "userName";
+ public static final String PASSWORD_ELEMENT = "password";
+ public static final String CLOUD_CONTROLLER_EVENT_STREAM = "org.apache.stratos.cloud.controller";
+ public static final String CLOUD_CONTROLLER_COL_FAMILY = CLOUD_CONTROLLER_EVENT_STREAM
+ .replaceAll("[/.]", "_");
- /**
- * column names
- */
- public static final String PAYLOAD_PREFIX = "payload_";
- public static final String MEMBER_ID_COL = "memberId";
- public static final String CARTRIDGE_TYPE_COL = "cartridgeType";
- public static final String CLUSTER_ID_COL = "clusterId";
- public static final String PARTITION_ID_COL = "partitionId";
- public static final String NETWORK_ID_COL = "networkId";
- public static final String ALIAS_COL = "alias";
- public static final String TENANT_RANGE_COL = "tenantRange";
- public static final String IS_MULTI_TENANT_COL = "isMultiTenant";
- public static final String IAAS_COL = "iaas";
- public static final String STATUS_COL = "status";
- public static final String HOST_NAME_COL = "hostName";
- public static final String HYPERVISOR_COL = "hypervisor";
- public static final String RAM_COL = "ram";
- public static final String IMAGE_ID_COL = "imageId";
- public static final String LOGIN_PORT_COL = "loginPort";
- public static final String OS_NAME_COL = "osName";
- public static final String OS_VERSION_COL = "osVersion";
- public static final String OS_ARCH_COL = "osArch";
- public static final String OS_BIT_COL = "is64bitOS";
- public static final String PRIV_IP_COL = "privateIPAddresses";
- public static final String PUB_IP_COL = "publicIPAddresses";
- public static final String ALLOCATE_IP_COL = "allocateIPAddresses";
+ /**
+ * column names
+ */
+ public static final String PAYLOAD_PREFIX = "payload_";
+ public static final String MEMBER_ID_COL = "memberId";
+ public static final String CARTRIDGE_TYPE_COL = "cartridgeType";
+ public static final String CLUSTER_ID_COL = "clusterId";
+ public static final String PARTITION_ID_COL = "partitionId";
+ public static final String NETWORK_ID_COL = "networkId";
+ public static final String ALIAS_COL = "alias";
+ public static final String TENANT_RANGE_COL = "tenantRange";
+ public static final String IS_MULTI_TENANT_COL = "isMultiTenant";
+ public static final String IAAS_COL = "iaas";
+ public static final String STATUS_COL = "status";
+ public static final String HOST_NAME_COL = "hostName";
+ public static final String HYPERVISOR_COL = "hypervisor";
+ public static final String RAM_COL = "ram";
+ public static final String IMAGE_ID_COL = "imageId";
+ public static final String LOGIN_PORT_COL = "loginPort";
+ public static final String OS_NAME_COL = "osName";
+ public static final String OS_VERSION_COL = "osVersion";
+ public static final String OS_ARCH_COL = "osArch";
+ public static final String OS_BIT_COL = "is64bitOS";
+ public static final String PRIV_IP_COL = "privateIPAddresses";
+ public static final String PUB_IP_COL = "publicIPAddresses";
+ public static final String ALLOCATE_IP_COL = "allocateIPAddresses";
- /**
- * Properties
- */
- public static final String REGION_PROPERTY = "region";
- public static final String TOPICS_PROPERTY = "topics";
- public static final String PUBLIC_IP_PROPERTY = "public_ip";
- public static final String TENANT_ID_PROPERTY = "tenant_id";
- public static final String ALIAS_PROPERTY = "alias";
- public static final String AUTO_ASSIGN_IP_PROPERTY = "autoAssignIp";
- public static final String JCLOUDS_ENDPOINT = "jclouds.endpoint";
- public static final String CRON_PROPERTY = "cron";
- public static final String AMQP_CONNECTION_URL_PROPERTY = "amqpConnectionUrl";
- public static final String AMQP_INITIAL_CONTEXT_FACTORY_PROPERTY = "amqpInitialContextFactory";
- public static final String AMQP_TOPIC_CONNECTION_FACTORY_PROPERTY = "amqpTopicConnectionFactory";
- public static final String INSTANCE_TOPIC = "instance/*";
- // pre define a floating ip
- public static final String FLOATING_IP_PROPERTY = "floatingIp";
- public static final String DEFAULT_FLOATING_IP_POOL = "defaultFloatingIpPool";
- public static final String OPENSTACK_NETWORKING_PROVIDER = "openstack.networking.provider";
- public static final String OPENSTACK_NEUTRON_NETWORKING = "neutron";
+ /**
+ * Properties
+ */
+ public static final String REGION_PROPERTY = "region";
+ public static final String TOPICS_PROPERTY = "topics";
+ public static final String PUBLIC_IP_PROPERTY = "public_ip";
+ public static final String TENANT_ID_PROPERTY = "tenant_id";
+ public static final String ALIAS_PROPERTY = "alias";
+ public static final String AUTO_ASSIGN_IP_PROPERTY = "autoAssignIp";
+ public static final String JCLOUDS_ENDPOINT = "jclouds.endpoint";
+ public static final String CRON_PROPERTY = "cron";
+ public static final String AMQP_CONNECTION_URL_PROPERTY = "amqpConnectionUrl";
+ public static final String AMQP_INITIAL_CONTEXT_FACTORY_PROPERTY = "amqpInitialContextFactory";
+ public static final String AMQP_TOPIC_CONNECTION_FACTORY_PROPERTY = "amqpTopicConnectionFactory";
+ public static final String INSTANCE_TOPIC = "instance/*";
+ // pre define a floating ip
+ public static final String FLOATING_IP_PROPERTY = "floatingIp";
+ public static final String DEFAULT_FLOATING_IP_POOL = "defaultFloatingIpPool";
+ public static final String OPENSTACK_NETWORKING_PROVIDER = "openstack.networking.provider";
+ public static final String OPENSTACK_NEUTRON_NETWORKING = "neutron";
- /**
- * XPath expressions
- */
- public static final String IAAS_PROVIDER_XPATH = "/"
- + CLOUD_CONTROLLER_ELEMENT + "/" + IAAS_PROVIDERS_ELEMENT + "/"
- + IAAS_PROVIDER_ELEMENT;
- public static final String PARTITION_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
- + "/" + PARTITIONS_ELEMENT + "/" + PARTITION_ELEMENT;
- public static final String REGION_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
- + "/" + IAAS_PROVIDERS_ELEMENT + "/" + IAAS_PROVIDER_ELEMENT + "/"
- + REGION_ELEMENT;
- public static final String ZONE_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
- + "/" + IAAS_PROVIDERS_ELEMENT + "/" + IAAS_PROVIDER_ELEMENT + "/"
- + REGION_ELEMENT + "/" + ZONE_ELEMENT;
- public static final String HOST_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
- + "/" + IAAS_PROVIDERS_ELEMENT + "/" + IAAS_PROVIDER_ELEMENT + "/"
- + REGION_ELEMENT + "/" + ZONE_ELEMENT + "/" + HOST_ELEMENT;
- public static final String PROPERTY_ELEMENT_XPATH = "/" + PROPERTY_ELEMENT;
- public static final String IMAGE_ID_ELEMENT_XPATH = "/" + IMAGE_ID_ELEMENT;
- public static final String SCALE_UP_ORDER_ELEMENT_XPATH = "/"
- + SCALE_UP_ORDER_ELEMENT;
- public static final String SCALE_DOWN_ORDER_ELEMENT_XPATH = "/"
- + SCALE_DOWN_ORDER_ELEMENT;
- public static final String PROVIDER_ELEMENT_XPATH = "/" + PROPERTY_ELEMENT;
- public static final String IDENTITY_ELEMENT_XPATH = "/" + IDENTITY_ELEMENT;
- public static final String CREDENTIAL_ELEMENT_XPATH = "/"
- + CREDENTIAL_ELEMENT;
- public static final String SERVICES_ELEMENT_XPATH = "/" + SERVICES_ELEMENT
- + "/" + SERVICE_ELEMENT;
- public static final String SERVICE_ELEMENT_XPATH = "/" + SERVICE_ELEMENT;
- public static final String CARTRIDGE_ELEMENT_XPATH = "/"
- + CARTRIDGE_ELEMENT;
- public static final String PAYLOAD_ELEMENT_XPATH = "/" + PAYLOAD_ELEMENT;
- public static final String HOST_ELEMENT_XPATH = "/" + HOST_ELEMENT;
- public static final String CARTRIDGES_ELEMENT_XPATH = "/"
- + CARTRIDGES_ELEMENT + "/" + CARTRIDGE_ELEMENT;
- public static final String IAAS_PROVIDER_ELEMENT_XPATH = "/"
- + IAAS_PROVIDER_ELEMENT;
- public static final String DEPLOYMENT_ELEMENT_XPATH = "/"
- + DEPLOYMENT_ELEMENT;
- public static final String PORT_MAPPING_ELEMENT_XPATH = "/"
- + PORT_MAPPING_ELEMENT;
- public static final String APP_TYPES_ELEMENT_XPATH = "/"
- + APP_TYPES_ELEMENT;
+ /**
+ * XPath expressions
+ */
+ public static final String IAAS_PROVIDER_XPATH = "/"
+ + CLOUD_CONTROLLER_ELEMENT + "/" + IAAS_PROVIDERS_ELEMENT + "/"
+ + IAAS_PROVIDER_ELEMENT;
+ public static final String PARTITION_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
+ + "/" + PARTITIONS_ELEMENT + "/" + PARTITION_ELEMENT;
+ public static final String REGION_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
+ + "/" + IAAS_PROVIDERS_ELEMENT + "/" + IAAS_PROVIDER_ELEMENT + "/"
+ + REGION_ELEMENT;
+ public static final String ZONE_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
+ + "/" + IAAS_PROVIDERS_ELEMENT + "/" + IAAS_PROVIDER_ELEMENT + "/"
+ + REGION_ELEMENT + "/" + ZONE_ELEMENT;
+ public static final String HOST_XPATH = "/" + CLOUD_CONTROLLER_ELEMENT
+ + "/" + IAAS_PROVIDERS_ELEMENT + "/" + IAAS_PROVIDER_ELEMENT + "/"
+ + REGION_ELEMENT + "/" + ZONE_ELEMENT + "/" + HOST_ELEMENT;
+ public static final String PROPERTY_ELEMENT_XPATH = "/" + PROPERTY_ELEMENT;
+ public static final String IMAGE_ID_ELEMENT_XPATH = "/" + IMAGE_ID_ELEMENT;
+ public static final String SCALE_UP_ORDER_ELEMENT_XPATH = "/"
+ + SCALE_UP_ORDER_ELEMENT;
+ public static final String SCALE_DOWN_ORDER_ELEMENT_XPATH = "/"
+ + SCALE_DOWN_ORDER_ELEMENT;
+ public static final String PROVIDER_ELEMENT_XPATH = "/" + PROPERTY_ELEMENT;
+ public static final String IDENTITY_ELEMENT_XPATH = "/" + IDENTITY_ELEMENT;
+ public static final String CREDENTIAL_ELEMENT_XPATH = "/"
+ + CREDENTIAL_ELEMENT;
+ public static final String SERVICES_ELEMENT_XPATH = "/" + SERVICES_ELEMENT
+ + "/" + SERVICE_ELEMENT;
+ public static final String SERVICE_ELEMENT_XPATH = "/" + SERVICE_ELEMENT;
+ public static final String CARTRIDGE_ELEMENT_XPATH = "/"
+ + CARTRIDGE_ELEMENT;
+ public static final String PAYLOAD_ELEMENT_XPATH = "/" + PAYLOAD_ELEMENT;
+ public static final String HOST_ELEMENT_XPATH = "/" + HOST_ELEMENT;
+ public static final String CARTRIDGES_ELEMENT_XPATH = "/"
+ + CARTRIDGES_ELEMENT + "/" + CARTRIDGE_ELEMENT;
+ public static final String IAAS_PROVIDER_ELEMENT_XPATH = "/"
+ + IAAS_PROVIDER_ELEMENT;
+ public static final String DEPLOYMENT_ELEMENT_XPATH = "/"
+ + DEPLOYMENT_ELEMENT;
+ public static final String PORT_MAPPING_ELEMENT_XPATH = "/"
+ + PORT_MAPPING_ELEMENT;
+ public static final String APP_TYPES_ELEMENT_XPATH = "/"
+ + APP_TYPES_ELEMENT;
- public static final String DATA_PUBLISHER_XPATH = "/"
- + CLOUD_CONTROLLER_ELEMENT + "/" + DATA_PUBLISHER_ELEMENT;
- public static final String TOPOLOGY_SYNC_XPATH = "/"
- + CLOUD_CONTROLLER_ELEMENT + "/" + TOPOLOGY_SYNC_ELEMENT;
- public static final String DATA_PUBLISHER_CRON_XPATH = "/"
- + CLOUD_CONTROLLER_ELEMENT + "/" + CRON_ELEMENT;
- public static final String BAM_SERVER_ADMIN_USERNAME_XPATH = "/"
- + CLOUD_CONTROLLER_ELEMENT + "/"
- + BAM_SERVER_ADMIN_USERNAME_ELEMENT;
- public static final String BAM_SERVER_ADMIN_PASSWORD_XPATH = "/"
- + CLOUD_CONTROLLER_ELEMENT + "/"
- + BAM_SERVER_ADMIN_PASSWORD_ELEMENT;
- // public static final String CASSANDRA_HOST_ADDRESS_XPATH =
- // "/"+CLOUD_CONTROLLER_ELEMENT+
- // "/"+CASSANDRA_HOST_ADDRESS;
- // public static final String CASSANDRA_HOST_PORT_XPATH =
- // "/"+CLOUD_CONTROLLER_ELEMENT+
- // "/"+CASSANDRA_HOST_PORT;
+ public static final String DATA_PUBLISHER_XPATH = "/"
+ + CLOUD_CONTROLLER_ELEMENT + "/" + DATA_PUBLISHER_ELEMENT;
+ public static final String TOPOLOGY_SYNC_XPATH = "/"
+ + CLOUD_CONTROLLER_ELEMENT + "/" + TOPOLOGY_SYNC_ELEMENT;
+ public static final String DATA_PUBLISHER_CRON_XPATH = "/"
+ + CLOUD_CONTROLLER_ELEMENT + "/" + CRON_ELEMENT;
+ public static final String BAM_SERVER_ADMIN_USERNAME_XPATH = "/"
+ + CLOUD_CONTROLLER_ELEMENT + "/"
+ + BAM_SERVER_ADMIN_USERNAME_ELEMENT;
+ public static final String BAM_SERVER_ADMIN_PASSWORD_XPATH = "/"
+ + CLOUD_CONTROLLER_ELEMENT + "/"
+ + BAM_SERVER_ADMIN_PASSWORD_ELEMENT;
+ // public static final String CASSANDRA_HOST_ADDRESS_XPATH =
+ // "/"+CLOUD_CONTROLLER_ELEMENT+
+ // "/"+CASSANDRA_HOST_ADDRESS;
+ // public static final String CASSANDRA_HOST_PORT_XPATH =
+ // "/"+CLOUD_CONTROLLER_ELEMENT+
+ // "/"+CASSANDRA_HOST_PORT;
- /**
- * Secret Manager related aliases.
- */
+ /**
+ * Secret Manager related aliases.
+ */
public static final String ALIAS_ATTRIBUTE = "secretAlias";
public static final String ALIAS_ATTRIBUTE_PREFIX = "svns";
public static final String ALIAS_NAMESPACE = "http://org.wso2.securevault/configuration";
- /**
- * Payload related constants
- */
- public static final String PAYLOAD_NAME = "payload";
- public static final String ENTRY_SEPARATOR = ",";
+ /**
+ * Payload related constants
+ */
+ public static final String PAYLOAD_NAME = "payload";
+ public static final String ENTRY_SEPARATOR = ",";
- /**
- * Publisher task related constants
- */
- public static final String DATA_PUB_TASK_TYPE = "CLOUD_CONTROLLER_DATA_PUBLISHER_TASK";
- // default is : data publisher will run in first second of every minute
- public static final String PUB_CRON_EXPRESSION = "1 * * * * ? *";
- public static final String DATA_PUB_TASK_NAME = "CartridgeInstanceDataPublisher";
- public static final String DEFAULT_BAM_SERVER_USER_NAME = "admin";
- public static final String DEFAULT_BAM_SERVER_PASSWORD = "admin";
- public static final String DEFAULT_CASSANDRA_URL = "localhost:9160";
- public static final String DEFAULT_CASSANDRA_USER = "admin";
- public static final String DEFAULT_CASSANDRA_PASSWORD = "admin";
- public static final String DEFAULT_CASSANDRA_CLUSTER_NAME = "Test Cluster";
- public static final String DEFAULT_CASSANDRA_KEY_SPACE = "EVENT_KS";
+ /**
+ * Publisher task related constants
+ */
+ public static final String DATA_PUB_TASK_TYPE = "CLOUD_CONTROLLER_DATA_PUBLISHER_TASK";
+ // default is : data publisher will run in first second of every minute
+ public static final String PUB_CRON_EXPRESSION = "1 * * * * ? *";
+ public static final String DATA_PUB_TASK_NAME = "CartridgeInstanceDataPublisher";
+ public static final String DEFAULT_BAM_SERVER_USER_NAME = "admin";
+ public static final String DEFAULT_BAM_SERVER_PASSWORD = "admin";
+ public static final String DEFAULT_CASSANDRA_URL = "localhost:9160";
+ public static final String DEFAULT_CASSANDRA_USER = "admin";
+ public static final String DEFAULT_CASSANDRA_PASSWORD = "admin";
+ public static final String DEFAULT_CASSANDRA_CLUSTER_NAME = "Test Cluster";
+ public static final String DEFAULT_CASSANDRA_KEY_SPACE = "EVENT_KS";
- /**
- * Directories
- */
- public static final String SERVICES_DIR = CarbonUtils.getCarbonRepository()
- + File.separator + "services" + File.separator;
+ /**
+ * Directories
+ */
+ public static final String SERVICES_DIR = CarbonUtils.getCarbonRepository()
+ + File.separator + "services" + File.separator;
- /**
- * Topology sync related constants
- */
- public static final String TOPOLOGY_FILE_PATH = CarbonUtils
- .getCarbonConfigDirPath()
- + File.separator
- + "service-topology.conf";
- public static final String TOPOLOGY_SYNC_CRON = "1 * * * * ? *";
- public static final String TOPOLOGY_SYNC_TASK_NAME = "TOPOLOGY_SYNC_TASK";
- public static final String TOPOLOGY_SYNC_TASK_TYPE = "TOPOLOGY_SYNC_TASK_TYPE";
- public static final String AMQP_CONNECTION_URL = "amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5672'";
- public static final String AMQP_INITIAL_CONTEXT_FACTORY = "org.wso2.andes.jndi.PropertiesFileInitialContextFactory";
- public static final String AMQP_TOPIC_CONNECTION_FACTORY = "qpidConnectionfactory";
+ /**
+ * Topology sync related constants
+ */
+ public static final String TOPOLOGY_FILE_PATH = CarbonUtils
+ .getCarbonConfigDirPath()
+ + File.separator
+ + "service-topology.conf";
+ public static final String TOPOLOGY_SYNC_CRON = "1 * * * * ? *";
+ public static final String TOPOLOGY_SYNC_TASK_NAME = "TOPOLOGY_SYNC_TASK";
+ public static final String TOPOLOGY_SYNC_TASK_TYPE = "TOPOLOGY_SYNC_TASK_TYPE";
+ public static final String AMQP_CONNECTION_URL = "amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5672'";
+ public static final String AMQP_INITIAL_CONTEXT_FACTORY = "org.wso2.andes.jndi.PropertiesFileInitialContextFactory";
+ public static final String AMQP_TOPIC_CONNECTION_FACTORY = "qpidConnectionfactory";
- /**
- * Persistence
- */
- public static final String DATA_RESOURCE = "/cloud.controller/data";
- public static final String TOPOLOGY_RESOURCE = "/cloud.controller/topology";
- public static final String AVAILABILITY_ZONE = "availabilityZone";
- public static final String KEY_PAIR = "keyPair";
- public static final String HOST = "host";
- public static final String SECURITY_GROUP_IDS = "securityGroupIds";
- public static final String SECURITY_GROUPS = "securityGroups";
- public static final String SUBNET_ID = "subnetId";
- public static final String TAGS = "tags";
- public static final String TAGS_AS_KEY_VALUE_PAIRS_PREFIX = "tag:";
- public static final String AUTO_ASSIGN_IP = "autoAssignIp";
- public static final String BLOCK_UNTIL_RUNNING = "blockUntilRunning";
- public static final String INSTANCE_TYPE = "instanceType";
- public static final String ASSOCIATE_PUBLIC_IP_ADDRESS = "associatePublicIpAddress";
- public static final String LB_CLUSTER_ID_COL = "lbclusterId";
- public static final String NETWORK_INTERFACES = "networkInterfaces";
- public static final String NETWORK_FIXED_IP = "fixedIp";
- public static final String NETWORK_PORT = "portUuid";
- public static final String NETWORK_UUID = "networkUuid";
+ /**
+ * Persistence
+ */
+ public static final String DATA_RESOURCE = "/cloud.controller/data";
+ public static final String TOPOLOGY_RESOURCE = "/cloud.controller/topology";
+ public static final String AVAILABILITY_ZONE = "availabilityZone";
+ public static final String KEY_PAIR = "keyPair";
+ public static final String HOST = "host";
+ public static final String SECURITY_GROUP_IDS = "securityGroupIds";
+ public static final String SECURITY_GROUPS = "securityGroups";
+ public static final String SUBNET_ID = "subnetId";
+ public static final String TAGS = "tags";
+ public static final String TAGS_AS_KEY_VALUE_PAIRS_PREFIX = "tag:";
+ public static final String AUTO_ASSIGN_IP = "autoAssignIp";
+ public static final String BLOCK_UNTIL_RUNNING = "blockUntilRunning";
+ public static final String INSTANCE_TYPE = "instanceType";
+ public static final String ASSOCIATE_PUBLIC_IP_ADDRESS = "associatePublicIpAddress";
+ public static final String LB_CLUSTER_ID_COL = "lbclusterId";
+ public static final String NETWORK_INTERFACES = "networkInterfaces";
+ public static final String NETWORK_FIXED_IP = "fixedIp";
+ public static final String NETWORK_PORT = "portUuid";
+ public static final String NETWORK_UUID = "networkUuid";
// CloudStack specific
public static final String USER_NAME = "username";
public static final String DOMAIN_ID = "domainId";
public static final String DISK_OFFERING = "diskOffering";
- public static final String NETWORK_IDS= "networkIds";
-
+ public static final String NETWORK_IDS = "networkIds";
+
public static final String IS_LOAD_BALANCER = "load.balancer";
-
+
/**
* PortRange min max
*/
public static final int PORT_RANGE_MAX = 65535;
public static final int PORT_RANGE_MIN = 1;
-
+
public static final String KUBERNETES_PARTITION_PROVIDER = "kubernetes";
- /**
- * Load balancing ip type enumeration values
- */
- public static final String LOADBALANCING_IP_TYPE_PRIVATE = "private";
- public static final String LOADBALANCING_IP_TYPE_PUBLIE = "public";
+ /**
+ * Load balancing ip type enumeration values
+ */
+ public static final String LOADBALANCING_IP_TYPE_PRIVATE = "private";
+ public static final String LOADBALANCING_IP_TYPE_PUBLIE = "public";
}
[2/6] stratos git commit: Formatting cloud controller code
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index 400b389..d96638e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -52,12 +52,12 @@ import java.util.Properties;
public class CloudControllerUtil {
- private static final Log log = LogFactory.getLog(CloudControllerUtil.class);
+ private static final Log log = LogFactory.getLog(CloudControllerUtil.class);
public static Iaas createIaasInstance(IaasProvider iaasProvider)
throws InvalidIaasProviderException {
try {
- if(iaasProvider.getClassName() == null) {
+ if (iaasProvider.getClassName() == null) {
String msg = "You have not specified a class which represents the iaas of type: ["
+ iaasProvider.getType() + "].";
log.error(msg);
@@ -82,40 +82,40 @@ public class CloudControllerUtil {
}
Cartridge cartridge = new Cartridge();
- // populate cartridge
- cartridge.setType(config.getType());
- cartridge.setDisplayName(config.getDisplayName());
- cartridge.setDescription(config.getDescription());
- cartridge.setHostName(config.getHostName());
- String[] deploymentDirs = config.getDeploymentDirs();
- cartridge.setDeploymentDirs(deploymentDirs);
- cartridge.setProvider(config.getProvider());
- cartridge.setCategory(config.getCategory());
- cartridge.setVersion(config.getVersion());
- cartridge.setBaseDir(config.getBaseDir());
-
+ // populate cartridge
+ cartridge.setType(config.getType());
+ cartridge.setDisplayName(config.getDisplayName());
+ cartridge.setDescription(config.getDescription());
+ cartridge.setHostName(config.getHostName());
+ String[] deploymentDirs = config.getDeploymentDirs();
+ cartridge.setDeploymentDirs(deploymentDirs);
+ cartridge.setProvider(config.getProvider());
+ cartridge.setCategory(config.getCategory());
+ cartridge.setVersion(config.getVersion());
+ cartridge.setBaseDir(config.getBaseDir());
+
if (config.getPortMappings() != null) {
- cartridge.setPortMappings(config.getPortMappings());
- }
-
- if(config.getPersistence() != null){
- cartridge.setPersistence(config.getPersistence());
+ cartridge.setPortMappings(config.getPortMappings());
+ }
+
+ if (config.getPersistence() != null) {
+ cartridge.setPersistence(config.getPersistence());
}
cartridge.setMultiTenant(config.isMultiTenant());
cartridge.setTenantPartitions(config.getTenantPartitions());
cartridge.setLoadBalancingIPType(getLoadBalancingIPTypeStringFromEnum(LoadBalancingIPType.Private));
- if(StringUtils.isNotBlank(config.getLoadBalancingIPType())) {
- if(config.getLoadBalancingIPType().equals("public")) {
+ if (StringUtils.isNotBlank(config.getLoadBalancingIPType())) {
+ if (config.getLoadBalancingIPType().equals("public")) {
cartridge.setLoadBalancingIPType(getLoadBalancingIPTypeStringFromEnum(LoadBalancingIPType.Public));
}
}
if (config.getMetadataKeys() == null) {
- cartridge.setMetadataKeys(new String[0]);
- } else {
- cartridge.setMetadataKeys(config.getMetadataKeys());
- }
-
+ cartridge.setMetadataKeys(new String[0]);
+ } else {
+ cartridge.setMetadataKeys(config.getMetadataKeys());
+ }
+
org.apache.stratos.common.Properties props = config.getProperties();
if (props != null) {
for (Property prop : props.getProperties()) {
@@ -174,7 +174,7 @@ public class CloudControllerUtil {
if (imageId != null) {
iaasProvider.setImage(imageId);
}
-
+
byte[] payload = iaasConfig.getPayload();
if (payload != null) {
iaasProvider.setPayload(payload);
@@ -186,7 +186,7 @@ public class CloudControllerUtil {
iaasProvider.addProperty(prop.getName(), String.valueOf(prop.getValue()));
}
}
-
+
NetworkInterfaces networkInterfaces = iaasConfig.getNetworkInterfaces();
if (networkInterfaces != null && networkInterfaces.getNetworkInterfaces() != null) {
iaasProvider.setNetworkInterfaces(networkInterfaces.getNetworkInterfaces());
@@ -197,20 +197,21 @@ public class CloudControllerUtil {
}
}
- if(config.getExportingProperties() != null){
+ if (config.getExportingProperties() != null) {
cartridge.setExportingProperties(config.getExportingProperties());
}
return cartridge;
}
- public static void sleep(long time){
- try {
- Thread.sleep(time);
- } catch (InterruptedException ignore) {}
-
+ public static void sleep(long time) {
+ try {
+ Thread.sleep(time);
+ } catch (InterruptedException ignore) {
+ }
+
}
-
+
public static String getProperty(org.apache.stratos.common.Properties properties, String key, String defaultValue) {
Properties props = toJavaUtilProperties(properties);
@@ -219,7 +220,7 @@ public class CloudControllerUtil {
public static String getProperty(Properties properties, String key, String defaultValue) {
if (key != null && properties != null) {
- for (Iterator<Entry<Object, Object>> iterator = properties.entrySet().iterator(); iterator.hasNext();) {
+ for (Iterator<Entry<Object, Object>> iterator = properties.entrySet().iterator(); iterator.hasNext(); ) {
Entry<Object, Object> type = iterator.next();
String propName = type.getKey().toString();
String propValue = type.getValue().toString();
@@ -243,7 +244,7 @@ public class CloudControllerUtil {
}
public static org.apache.stratos.common.Properties addProperty(org.apache.stratos.common.Properties properties,
- String key, String value) {
+ String key, String value) {
Property property = new Property();
property.setName(key);
property.setValue(value);
@@ -252,20 +253,21 @@ public class CloudControllerUtil {
newProperties.setProperties(ArrayUtils.add(properties.getProperties(), property));
return newProperties;
}
-
- /**
- * Converts org.apache.stratos.messaging.util.Properties to java.util.Properties
- * @param properties org.apache.stratos.messaging.util.Properties
- * @return java.util.Properties
- */
+
+ /**
+ * Converts org.apache.stratos.messaging.util.Properties to java.util.Properties
+ *
+ * @param properties org.apache.stratos.messaging.util.Properties
+ * @return java.util.Properties
+ */
public static Properties toJavaUtilProperties(
- org.apache.stratos.common.Properties properties) {
+ org.apache.stratos.common.Properties properties) {
Properties javaUtilsProperties = new Properties();
if (properties != null && properties.getProperties() != null) {
for (Property property : properties.getProperties()) {
- if((property != null) && (property.getValue() != null)) {
+ if ((property != null) && (property.getValue() != null)) {
javaUtilsProperties.put(property.getName(), property.getValue());
}
}
@@ -274,14 +276,14 @@ public class CloudControllerUtil {
return javaUtilsProperties;
}
-
+
public static void persistTopology(Topology topology) {
- try {
- RegistryManager.getInstance().persist(CloudControllerConstants.TOPOLOGY_RESOURCE, topology);
- } catch (RegistryException e) {
- String msg = "Failed to persist the Topology in registry. ";
- log.fatal(msg, e);
- }
+ try {
+ RegistryManager.getInstance().persist(CloudControllerConstants.TOPOLOGY_RESOURCE, topology);
+ } catch (RegistryException e) {
+ String msg = "Failed to persist the Topology in registry. ";
+ log.fatal(msg, e);
+ }
}
public static Topology retrieveTopology() {
@@ -295,31 +297,31 @@ public class CloudControllerUtil {
}
}
-
- public static void handleException(String msg, Exception e){
- log.error(msg, e);
- throw new CloudControllerException(msg, e);
- }
-
- public static void handleException(String msg){
- log.error(msg);
- throw new CloudControllerException(msg);
- }
-
- public static String getPartitionIds(Partition[] partitions) {
- StringBuilder str = new StringBuilder("");
- for (Partition partition : partitions) {
- str.append(partition.getId()+", ");
- }
-
- String partitionStr = str.length() == 0 ? str.toString() : str.substring(0, str.length()-2);
- return "[" +partitionStr+ "]";
- }
-
- public static void validateKubernetesCluster(KubernetesCluster kubernetesCluster) throws InvalidKubernetesClusterException {
+
+ public static void handleException(String msg, Exception e) {
+ log.error(msg, e);
+ throw new CloudControllerException(msg, e);
+ }
+
+ public static void handleException(String msg) {
+ log.error(msg);
+ throw new CloudControllerException(msg);
+ }
+
+ public static String getPartitionIds(Partition[] partitions) {
+ StringBuilder str = new StringBuilder("");
+ for (Partition partition : partitions) {
+ str.append(partition.getId() + ", ");
+ }
+
+ String partitionStr = str.length() == 0 ? str.toString() : str.substring(0, str.length() - 2);
+ return "[" + partitionStr + "]";
+ }
+
+ public static void validateKubernetesCluster(KubernetesCluster kubernetesCluster) throws InvalidKubernetesClusterException {
CloudControllerContext context = CloudControllerContext.getInstance();
-
- if (kubernetesCluster == null) {
+
+ if (kubernetesCluster == null) {
throw new InvalidKubernetesClusterException("Kubernetes cluster can not be null");
}
if (StringUtils.isEmpty(kubernetesCluster.getClusterId())) {
@@ -386,8 +388,8 @@ public class CloudControllerUtil {
throw new InvalidKubernetesClusterException(e.getMessage());
}
}
-
- private static void validateKubernetesHosts(KubernetesHost[] kubernetesHosts) throws InvalidKubernetesHostException {
+
+ private static void validateKubernetesHosts(KubernetesHost[] kubernetesHosts) throws InvalidKubernetesHostException {
if (kubernetesHosts == null || kubernetesHosts.length == 0) {
return;
}
@@ -430,18 +432,16 @@ public class CloudControllerUtil {
public static String getLoadBalancingIPTypeStringFromEnum(LoadBalancingIPType loadBalancingIPType) {
if (loadBalancingIPType == LoadBalancingIPType.Private) {
return CloudControllerConstants.LOADBALANCING_IP_TYPE_PRIVATE;
- }
- else if (loadBalancingIPType == LoadBalancingIPType.Public) {
+ } else if (loadBalancingIPType == LoadBalancingIPType.Public) {
return CloudControllerConstants.LOADBALANCING_IP_TYPE_PUBLIE;
}
return null;
}
public static LoadBalancingIPType getLoadBalancingIPTypeEnumFromString(String loadBalancingIPType) {
- if(loadBalancingIPType.equals(CloudControllerConstants.LOADBALANCING_IP_TYPE_PUBLIE)) {
+ if (loadBalancingIPType.equals(CloudControllerConstants.LOADBALANCING_IP_TYPE_PUBLIE)) {
return LoadBalancingIPType.Public;
- }
- else if(loadBalancingIPType.equals(CloudControllerConstants.LOADBALANCING_IP_TYPE_PRIVATE)) {
+ } else if (loadBalancingIPType.equals(CloudControllerConstants.LOADBALANCING_IP_TYPE_PRIVATE)) {
return LoadBalancingIPType.Private;
}
return null;
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ComputeServiceBuilderUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ComputeServiceBuilderUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ComputeServiceBuilderUtil.java
index af985b2..85ab3c8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ComputeServiceBuilderUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ComputeServiceBuilderUtil.java
@@ -43,9 +43,9 @@ import java.util.Properties;
* This class is responsible for creating a JClouds specific ComputeService object.
*/
public class ComputeServiceBuilderUtil {
-
+
private static final Log log = LogFactory.getLog(ComputeServiceBuilderUtil.class);
-
+
public static byte[] getUserData(String payloadFileName) {
byte[] bytes = null;
try {
@@ -64,7 +64,7 @@ public class ComputeServiceBuilderUtil {
return bytes;
}
-
+
public static ComputeService buildDefaultComputeService(IaasProvider iaasProvider) {
Properties properties = new Properties();
@@ -76,18 +76,18 @@ public class ComputeServiceBuilderUtil {
// set modules
Iterable<Module> modules =
- ImmutableSet.<Module> of(new SshjSshClientModule(), new SLF4JLoggingModule(),
- new EnterpriseConfigurationModule());
+ ImmutableSet.<Module>of(new SshjSshClientModule(), new SLF4JLoggingModule(),
+ new EnterpriseConfigurationModule());
// build context
ContextBuilder builder =
- ContextBuilder.newBuilder(iaasProvider.getProvider())
- .credentials(iaasProvider.getIdentity(), iaasProvider.getCredential()).modules(modules)
- .overrides(properties);
+ ContextBuilder.newBuilder(iaasProvider.getProvider())
+ .credentials(iaasProvider.getIdentity(), iaasProvider.getCredential()).modules(modules)
+ .overrides(properties);
return builder.buildView(ComputeServiceContext.class).getComputeService();
}
-
+
public static String extractRegion(IaasProvider iaas) {
String region;
// try to find region
@@ -99,19 +99,18 @@ public class ComputeServiceBuilderUtil {
}
return region;
}
-
- public static String extractZone(IaasProvider iaas) {
- return iaas.getProperty(CloudControllerConstants.AVAILABILITY_ZONE);
- }
-
- /** Returns the contents of the file in a byte array
+ public static String extractZone(IaasProvider iaas) {
+
+ return iaas.getProperty(CloudControllerConstants.AVAILABILITY_ZONE);
+ }
+
+ /**
+ * Returns the contents of the file in a byte array
*
- * @param file
- * - Input File
+ * @param file - Input File
* @return Bytes from the file
- * @throws java.io.IOException
- * , if retrieving the file contents failed.
+ * @throws java.io.IOException , if retrieving the file contents failed.
*/
public static byte[] getBytesFromFile(File file) throws IOException {
if (!file.exists()) {
@@ -124,7 +123,7 @@ public class ComputeServiceBuilderUtil {
try {
// Get the size of the file
long length = file.length();
-
+
// You cannot create an array using a long type.
// It needs to be an int type.
// Before converting to an int type, check
@@ -142,7 +141,7 @@ public class ComputeServiceBuilderUtil {
int offset = 0;
int numRead;
while (offset < bytes.length &&
- (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) {
+ (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) {
offset += numRead;
}
@@ -153,16 +152,15 @@ public class ComputeServiceBuilderUtil {
} finally {
// Close the input stream and return bytes
is.close();
- }
-
+ }
+
return bytes;
}
-
+
/**
* handles the exception
- *
- * @param msg
- * exception message
+ *
+ * @param msg exception message
*/
private static void handleException(String msg) {
log.error(msg);
@@ -171,17 +169,15 @@ public class ComputeServiceBuilderUtil {
/**
* handles the exception
- *
- * @param msg
- * exception message
- * @param e
- * exception
+ *
+ * @param msg exception message
+ * @param e exception
*/
private static void handleException(String msg, Exception e) {
log.error(msg, e);
throw new CloudControllerException(msg, e);
}
-
-
+
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/component.xml
index 1dc3a01..1e68714 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/component.xml
+++ b/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/component.xml
@@ -18,7 +18,7 @@
-->
<component xmlns="http://products.wso2.org/carbon">
<deployers>
- <deployer>
+ <deployer>
<directory>../../conf</directory>
<extension>xml</extension>
<class>org.apache.stratos.cloud.controller.deployers.CloudControllerDeployer</class>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/resources/cartridge.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/cartridge.xsd b/components/org.apache.stratos.cloud.controller/src/main/resources/cartridge.xsd
index 83833e5..d797048 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/resources/cartridge.xsd
+++ b/components/org.apache.stratos.cloud.controller/src/main/resources/cartridge.xsd
@@ -17,133 +17,134 @@
specific language governing permissions and limitations
under the License.
-->
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="cartridge">
- <xs:annotation>
- <xs:documentation>You can have 1..n cartridge elements.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="property" maxOccurs="unbounded"
- minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- cartridge element can have 0..n properties, and
- they'll be overwritten by the properties
- specified under iaasProvider child elements of
- cartridge element.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="name" />
- <xs:attribute type="xs:string" name="value" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="displayName" maxOccurs="1" minOccurs="0" />
- <xs:element name="description" maxOccurs="1" minOccurs="0" />
- <xs:element name="iaasProvider" maxOccurs="unbounded"
- minOccurs="1">
- <xs:annotation>
- <xs:documentation>
- A cartridge element should add a reference to an
- existing IaaS provider (specified in the above
- &lt;iaasProviders&gt; section) or it can
- create a completely new IaaS Provider (which
- should have a unique "type" attribute.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element type="xs:string" name="scaleUpOrder"
- minOccurs="0" maxOccurs="1" />
- <xs:element type="xs:string" name="scaleDownOrder"
- minOccurs="0" maxOccurs="1" />
- <xs:element type="xs:string" name="imageId"
- minOccurs="0" maxOccurs="1" />
- <xs:element name="property"
- maxOccurs="unbounded" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string"
- name="name" />
- <xs:attribute type="xs:string"
- name="value" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:attribute type="xs:string" name="type" />
- </xs:complexType>
- </xs:element>
- <xs:element name="deployment" maxOccurs="1" minOccurs="1">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="dir" maxOccurs="unbounded"
- minOccurs="0" type="xs:string">
- </xs:element>
- </xs:choice>
- <xs:attribute name="baseDir" type="xs:string">
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="portMapping" maxOccurs="1"
- minOccurs="1">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="http" maxOccurs="1"
- minOccurs="1">
- <xs:complexType>
- <xs:attribute name="port"
- type="xs:string" />
- <xs:attribute name="proxyPort"
- type="xs:string" />
- </xs:complexType>
- </xs:element>
- <xs:element name="https" maxOccurs="1"
- minOccurs="0">
- <xs:complexType>
- <xs:attribute name="port"
- type="xs:string" />
- <xs:attribute name="proxyPort"
- type="xs:string" />
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="appTypes" maxOccurs="1"
- minOccurs="1">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="appType" maxOccurs="unbounded"
- minOccurs="1">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required" />
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="cartridge">
+ <xs:annotation>
+ <xs:documentation>You can have 1..n cartridge elements.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="property" maxOccurs="unbounded"
+ minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ cartridge element can have 0..n properties, and
+ they'll be overwritten by the properties
+ specified under iaasProvider child elements of
+ cartridge element.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:string" name="name"/>
+ <xs:attribute type="xs:string" name="value"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="displayName" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="description" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="iaasProvider" maxOccurs="unbounded"
+ minOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A cartridge element should add a reference to an
+ existing IaaS provider (specified in the above
+ &lt;iaasProviders&gt; section) or it can
+ create a completely new IaaS Provider (which
+ should have a unique "type" attribute.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element type="xs:string" name="scaleUpOrder"
+ minOccurs="0" maxOccurs="1"/>
+ <xs:element type="xs:string" name="scaleDownOrder"
+ minOccurs="0" maxOccurs="1"/>
+ <xs:element type="xs:string" name="imageId"
+ minOccurs="0" maxOccurs="1"/>
+ <xs:element name="property"
+ maxOccurs="unbounded" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:string"
+ name="name"/>
+ <xs:attribute type="xs:string"
+ name="value"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ <xs:attribute type="xs:string" name="type"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deployment" maxOccurs="1" minOccurs="1">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="dir" maxOccurs="unbounded"
+ minOccurs="0" type="xs:string">
+ </xs:element>
+ </xs:choice>
+ <xs:attribute name="baseDir" type="xs:string">
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="portMapping" maxOccurs="1"
+ minOccurs="1">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="http" maxOccurs="1"
+ minOccurs="1">
+ <xs:complexType>
+ <xs:attribute name="port"
+ type="xs:string"/>
+ <xs:attribute name="proxyPort"
+ type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="https" maxOccurs="1"
+ minOccurs="0">
+ <xs:complexType>
+ <xs:attribute name="port"
+ type="xs:string"/>
+ <xs:attribute name="proxyPort"
+ type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="appTypes" maxOccurs="1"
+ minOccurs="1">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="appType" maxOccurs="unbounded"
+ minOccurs="1">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="appSpecificMapping"
- type="xs:string" />
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:attribute type="xs:string" name="type" />
- <xs:attribute type="xs:string" name="host" />
- <xs:attribute type="xs:string" name="provider" />
- <xs:attribute type="xs:string" name="version" />
- <xs:attribute type="xs:boolean" name="multiTenant" />
- </xs:complexType>
- </xs:element>
+ type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ <xs:attribute type="xs:string" name="type"/>
+ <xs:attribute type="xs:string" name="host"/>
+ <xs:attribute type="xs:string" name="provider"/>
+ <xs:attribute type="xs:string" name="version"/>
+ <xs:attribute type="xs:boolean" name="multiTenant"/>
+ </xs:complexType>
+ </xs:element>
- <!-- <xs:complexType name="deploymentType">
- <xs:sequence>
- <xs:element name="dir" type="xs:string" maxOccurs="1" minOccurs="1"></xs:element>
- </xs:sequence>
- </xs:complexType> -->
+ <!-- <xs:complexType name="deploymentType">
+ <xs:sequence>
+ <xs:element name="dir" type="xs:string" maxOccurs="1" minOccurs="1"></xs:element>
+ </xs:sequence>
+ </xs:complexType> -->
</xs:schema>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/resources/cartridges.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/cartridges.xsd b/components/org.apache.stratos.cloud.controller/src/main/resources/cartridges.xsd
index 894125d..23632cb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/resources/cartridges.xsd
+++ b/components/org.apache.stratos.cloud.controller/src/main/resources/cartridges.xsd
@@ -17,144 +17,146 @@
specific language governing permissions and limitations
under the License.
-->
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="cartridges" >
- <xs:annotation>
- <xs:documentation>Use below section to specify properties that are needed in order to start Cartridges.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="cartridge" maxOccurs="unbounded" minOccurs="1">
- <xs:annotation>
- <xs:documentation>You can have 1..n cartridge elements.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="property" maxOccurs="unbounded"
- minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- cartridge element can have 0..n properties,
- and they'll be overwritten by the properties
- specified under iaasProvider child elements
- of cartridge element.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string"
- name="name" />
- <xs:attribute type="xs:string"
- name="value" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="displayName" maxOccurs="1"
- minOccurs="0" />
- <xs:element name="description" maxOccurs="1"
- minOccurs="0" />
- <xs:element name="iaasProvider" maxOccurs="unbounded"
- minOccurs="1">
- <xs:annotation>
- <xs:documentation>
- A cartridge element should add a reference
- to an existing IaaS provider (specified in
- the above &lt;iaasProviders&gt;
- section) or it can create a completely new
- IaaS Provider (which should have a unique
- "type" attribute.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element type="xs:string" name="scaleUpOrder"
- minOccurs="0" maxOccurs="1" />
- <xs:element type="xs:string" name="scaleDownOrder"
- minOccurs="0" maxOccurs="1" />
- <xs:element type="xs:string" name="imageId"
- minOccurs="0" maxOccurs="1" />
- <xs:element name="property"
- maxOccurs="unbounded" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension
- base="xs:string">
- <xs:attribute
- type="xs:string" name="name" />
- <xs:attribute
- type="xs:string" name="value" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:attribute type="xs:string" name="type" />
- </xs:complexType>
- </xs:element>
- <xs:element name="deployment" maxOccurs="1">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="dir" maxOccurs="unbounded"
- minOccurs="0" type="xs:string">
- </xs:element>
- </xs:choice>
- <xs:attribute name="baseDir" type="xs:string">
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="portMapping" maxOccurs="1"
- minOccurs="1">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="http" maxOccurs="1"
- minOccurs="1">
- <xs:complexType>
- <xs:attribute name="port"
- type="xs:string" />
- <xs:attribute name="proxyPort"
- type="xs:string" />
- </xs:complexType>
- </xs:element>
- <xs:element name="https" maxOccurs="1"
- minOccurs="0">
- <xs:complexType>
- <xs:attribute name="port"
- type="xs:string" />
- <xs:attribute name="proxyPort"
- type="xs:string" />
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- <xs:element name="appTypes" maxOccurs="1"
- minOccurs="1">
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="appType" maxOccurs="unbounded"
- minOccurs="1">
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required" />
- <xs:attribute name="appSpecificMapping"
- type="xs:string" />
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:attribute type="xs:string" name="type"/>
- <xs:attribute type="xs:string" name="host" />
- <xs:attribute type="xs:string" name="provider" />
- <xs:attribute type="xs:string" name="version" />
- <xs:attribute type="xs:boolean" name="multiTenant" />
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="cartridges">
+ <xs:annotation>
+ <xs:documentation>Use below section to specify properties that are needed in order to start Cartridges.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="cartridge" maxOccurs="unbounded" minOccurs="1">
+ <xs:annotation>
+ <xs:documentation>You can have 1..n cartridge elements.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="property" maxOccurs="unbounded"
+ minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ cartridge element can have 0..n properties,
+ and they'll be overwritten by the properties
+ specified under iaasProvider child elements
+ of cartridge element.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:string"
+ name="name"/>
+ <xs:attribute type="xs:string"
+ name="value"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="displayName" maxOccurs="1"
+ minOccurs="0"/>
+ <xs:element name="description" maxOccurs="1"
+ minOccurs="0"/>
+ <xs:element name="iaasProvider" maxOccurs="unbounded"
+ minOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ A cartridge element should add a reference
+ to an existing IaaS provider (specified in
+ the above &lt;iaasProviders&gt;
+ section) or it can create a completely new
+ IaaS Provider (which should have a unique
+ "type" attribute.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element type="xs:string" name="scaleUpOrder"
+ minOccurs="0" maxOccurs="1"/>
+ <xs:element type="xs:string" name="scaleDownOrder"
+ minOccurs="0" maxOccurs="1"/>
+ <xs:element type="xs:string" name="imageId"
+ minOccurs="0" maxOccurs="1"/>
+ <xs:element name="property"
+ maxOccurs="unbounded" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension
+ base="xs:string">
+ <xs:attribute
+ type="xs:string" name="name"/>
+ <xs:attribute
+ type="xs:string" name="value"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ <xs:attribute type="xs:string" name="type"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deployment" maxOccurs="1">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="dir" maxOccurs="unbounded"
+ minOccurs="0" type="xs:string">
+ </xs:element>
+ </xs:choice>
+ <xs:attribute name="baseDir" type="xs:string">
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="portMapping" maxOccurs="1"
+ minOccurs="1">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="http" maxOccurs="1"
+ minOccurs="1">
+ <xs:complexType>
+ <xs:attribute name="port"
+ type="xs:string"/>
+ <xs:attribute name="proxyPort"
+ type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="https" maxOccurs="1"
+ minOccurs="0">
+ <xs:complexType>
+ <xs:attribute name="port"
+ type="xs:string"/>
+ <xs:attribute name="proxyPort"
+ type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="appTypes" maxOccurs="1"
+ minOccurs="1">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="appType" maxOccurs="unbounded"
+ minOccurs="1">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="appSpecificMapping"
+ type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ <xs:attribute type="xs:string" name="type"/>
+ <xs:attribute type="xs:string" name="host"/>
+ <xs:attribute type="xs:string" name="provider"/>
+ <xs:attribute type="xs:string" name="version"/>
+ <xs:attribute type="xs:boolean" name="multiTenant"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/resources/service.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/service.xsd b/components/org.apache.stratos.cloud.controller/src/main/resources/service.xsd
index 6d4335f..3cd8524 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/resources/service.xsd
+++ b/components/org.apache.stratos.cloud.controller/src/main/resources/service.xsd
@@ -17,48 +17,49 @@
specific language governing permissions and limitations
under the License.
-->
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="service">
- <xs:annotation>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="service">
+ <xs:annotation>
<xs:documentation>you can have 0..n service elements</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="cartridge">
- <xs:annotation>
- <xs:documentation>
- this element's value should be a reference
- to an existing cartridge
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string"
- name="type" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="payload" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
- <xs:element name="host" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
- <xs:element name="property"
- maxOccurs="unbounded" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string"
- name="name" />
- <xs:attribute type="xs:string"
- name="value" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:attribute type="xs:string" name="domain" />
- <xs:attribute type="xs:string" name="policyName" />
- <xs:attribute type="xs:string" name="tenantRange" />
- </xs:complexType>
- </xs:element>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="cartridge">
+ <xs:annotation>
+ <xs:documentation>
+ this element's value should be a reference
+ to an existing cartridge
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:string"
+ name="type"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="payload" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
+ <xs:element name="host" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
+ <xs:element name="property"
+ maxOccurs="unbounded" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:string"
+ name="name"/>
+ <xs:attribute type="xs:string"
+ name="value"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ <xs:attribute type="xs:string" name="domain"/>
+ <xs:attribute type="xs:string" name="policyName"/>
+ <xs:attribute type="xs:string" name="tenantRange"/>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/main/resources/services.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/services.xsd b/components/org.apache.stratos.cloud.controller/src/main/resources/services.xsd
index 77b18ca..87db993 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/resources/services.xsd
+++ b/components/org.apache.stratos.cloud.controller/src/main/resources/services.xsd
@@ -17,53 +17,56 @@
specific language governing permissions and limitations
under the License.
-->
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="services">
- <xs:annotation>
- <xs:documentation>Here you specify the service domains related details.</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:choice maxOccurs="unbounded">
- <xs:element name="service" maxOccurs="unbounded" minOccurs="1">
- <xs:annotation>
- <xs:documentation>you can have 0..n service elements</xs:documentation>
- </xs:annotation>
- <xs:complexType>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="services">
+ <xs:annotation>
+ <xs:documentation>Here you specify the service domains related details.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
<xs:choice maxOccurs="unbounded">
- <xs:element name="cartridge">
- <xs:annotation>
- <xs:documentation>this element's value should be a reference to an existing cartridge</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string" name="type"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="payload" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
- <xs:element name="host" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
- <xs:element name="property"
- maxOccurs="unbounded" minOccurs="0">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute type="xs:string"
- name="name" />
- <xs:attribute type="xs:string"
- name="value" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
+ <xs:element name="service" maxOccurs="unbounded" minOccurs="1">
+ <xs:annotation>
+ <xs:documentation>you can have 0..n service elements</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded">
+ <xs:element name="cartridge">
+ <xs:annotation>
+ <xs:documentation>this element's value should be a reference to an existing
+ cartridge
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:string" name="type"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="payload" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
+ <xs:element name="host" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element>
+ <xs:element name="property"
+ maxOccurs="unbounded" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute type="xs:string"
+ name="name"/>
+ <xs:attribute type="xs:string"
+ name="value"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ <xs:attribute type="xs:string" name="domain"/>
+ <xs:attribute type="xs:string" name="tenantRange"/>
+ <xs:attribute type="xs:string" name="policyName"/>
+ </xs:complexType>
+ </xs:element>
</xs:choice>
- <xs:attribute type="xs:string" name="domain"/>
- <xs:attribute type="xs:string" name="tenantRange" />
- <xs:attribute type="xs:string" name="policyName" />
- </xs:complexType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
- </xs:element>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomValidationTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomValidationTest.java b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomValidationTest.java
index 16c59b6..c9d30c1 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomValidationTest.java
+++ b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomValidationTest.java
@@ -27,7 +27,7 @@ import org.xml.sax.SAXParseException;
import junit.framework.TestCase;
public class AxiomValidationTest extends TestCase {
-
+
File xmlSchemaCartridges = new File("src/main/resources/cartridges.xsd");
File xmlSchemaCartridge = new File("src/main/resources/cartridge.xsd");
private String dir = "src/test/resources/";
@@ -35,80 +35,80 @@ public class AxiomValidationTest extends TestCase {
public AxiomValidationTest(String name) {
super(name);
}
-
+
protected void setUp() throws Exception {
super.setUp();
}
public final void testCartridgeValidation() throws Exception {
- OMElement elt = AxiomXpathParserUtil.parse(new File(dir+"cartridges-1.xml"));
-
+ OMElement elt = AxiomXpathParserUtil.parse(new File(dir + "cartridges-1.xml"));
+
// schema 1 - cartridges
AxiomXpathParserUtil.validate(elt, xmlSchemaCartridges);
-
- elt = AxiomXpathParserUtil.parse(new File(dir+"cartridges-5.xml"));
+
+ elt = AxiomXpathParserUtil.parse(new File(dir + "cartridges-5.xml"));
AxiomXpathParserUtil.validate(elt, xmlSchemaCartridges);
-
- elt = AxiomXpathParserUtil.parse(new File(dir+"cartridges-6.xml"));
+
+ elt = AxiomXpathParserUtil.parse(new File(dir + "cartridges-6.xml"));
AxiomXpathParserUtil.validate(elt, xmlSchemaCartridges);
-
- elt = AxiomXpathParserUtil.parse(new File(dir+"cartridges-7.xml"));
+
+ elt = AxiomXpathParserUtil.parse(new File(dir + "cartridges-7.xml"));
AxiomXpathParserUtil.validate(elt, xmlSchemaCartridges);
-
- elt = AxiomXpathParserUtil.parse(new File(dir+"cartridges-9.xml"));
+
+ elt = AxiomXpathParserUtil.parse(new File(dir + "cartridges-9.xml"));
AxiomXpathParserUtil.validate(elt, xmlSchemaCartridges);
-
- elt = AxiomXpathParserUtil.parse(new File(dir+"cartridges-2.xml"));
+
+ elt = AxiomXpathParserUtil.parse(new File(dir + "cartridges-2.xml"));
// schema 2 - cartridge
AxiomXpathParserUtil.validate(elt, xmlSchemaCartridge);
-
- elt = AxiomXpathParserUtil.parse(new File(dir+"cartridges-8.xml"));
+
+ elt = AxiomXpathParserUtil.parse(new File(dir + "cartridges-8.xml"));
AxiomXpathParserUtil.validate(elt, xmlSchemaCartridge);
}
-
+
public final void testCartridgeInvalidation() {
- OMElement elt1 = AxiomXpathParserUtil.parse(new File(dir+"cartridges-1.xml"));
- OMElement elt2 = AxiomXpathParserUtil.parse(new File(dir+"cartridges-2.xml"));
- OMElement elt3 = AxiomXpathParserUtil.parse(new File(dir+"cartridges-3.xml"));
- OMElement elt4 = AxiomXpathParserUtil.parse(new File(dir+"cartridges-4.xml"));
-
- // schema 1 - cartridges
+ OMElement elt1 = AxiomXpathParserUtil.parse(new File(dir + "cartridges-1.xml"));
+ OMElement elt2 = AxiomXpathParserUtil.parse(new File(dir + "cartridges-2.xml"));
+ OMElement elt3 = AxiomXpathParserUtil.parse(new File(dir + "cartridges-3.xml"));
+ OMElement elt4 = AxiomXpathParserUtil.parse(new File(dir + "cartridges-4.xml"));
+
+ // schema 1 - cartridges
try {
AxiomXpathParserUtil.validate(elt2, xmlSchemaCartridges);
} catch (Exception e) {
assertEquals(SAXParseException.class, e.getClass());
}
-
+
try {
AxiomXpathParserUtil.validate(elt3, xmlSchemaCartridges);
} catch (Exception e) {
assertEquals(SAXParseException.class, e.getClass());
}
-
+
try {
AxiomXpathParserUtil.validate(elt4, xmlSchemaCartridges);
} catch (Exception e) {
assertEquals(SAXParseException.class, e.getClass());
}
-
+
// schema 2 - cartridge
-
+
try {
AxiomXpathParserUtil.validate(elt1, xmlSchemaCartridge);
} catch (Exception e) {
assertEquals(SAXParseException.class, e.getClass());
}
-
+
try {
AxiomXpathParserUtil.validate(elt3, xmlSchemaCartridge);
} catch (Exception e) {
assertEquals(SAXParseException.class, e.getClass());
}
-
+
try {
AxiomXpathParserUtil.validate(elt4, xmlSchemaCartridge);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomXpathParserTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomXpathParserTest.java b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomXpathParserTest.java
index 93683d6..49709eb 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomXpathParserTest.java
+++ b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/AxiomXpathParserTest.java
@@ -42,22 +42,22 @@ public class AxiomXpathParserTest extends TestCase {
CloudControllerConfigParser.parse(docElt);
}
-
- public void testGetMatchingNodes(){
+
+ public void testGetMatchingNodes() {
List<OMNode> list = AxiomXpathParserUtil.getMatchingNodes("/cloudController/iaasProviders/iaasProvider/provider", docElt);
assertEquals(1, list.size());
assertEquals(1, CloudControllerConfig.getInstance().getIaasProviders().size());
}
-
+
public void testDataPublisherConfig() {
- assertEquals(true, CloudControllerConfig.getInstance().isBAMDataPublisherEnabled());
- assertEquals("nirmal", CloudControllerConfig.getInstance().getDataPubConfig().getBamUsername());
- assertEquals("nirmal", CloudControllerConfig.getInstance().getDataPubConfig().getBamPassword());
- }
-
+ assertEquals(true, CloudControllerConfig.getInstance().isBAMDataPublisherEnabled());
+ assertEquals("nirmal", CloudControllerConfig.getInstance().getDataPubConfig().getBamUsername());
+ assertEquals("nirmal", CloudControllerConfig.getInstance().getDataPubConfig().getBamPassword());
+ }
+
public void testTopologySynchParser() {
- assertNotNull(CloudControllerConfig.getInstance().getTopologyConfig());
- assertEquals("1 * * * * ? *", CloudControllerConfig.getInstance().getTopologyConfig().getProperty("cron"));
- }
+ assertNotNull(CloudControllerConfig.getInstance().getTopologyConfig());
+ assertEquals("1 * * * * ? *", CloudControllerConfig.getInstance().getTopologyConfig().getProperty("cron"));
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/CloudControllerContextTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/CloudControllerContextTest.java b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/CloudControllerContextTest.java
index 91be61b..164e239 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/CloudControllerContextTest.java
+++ b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/cartridge/autoscaler/service/axiom/CloudControllerContextTest.java
@@ -30,7 +30,7 @@ public class CloudControllerContextTest extends TestCase {
public CloudControllerContextTest(String name) {
super(name);
}
-
+
protected void setUp() throws Exception {
super.setUp();
}
@@ -42,48 +42,50 @@ public class CloudControllerContextTest extends TestCase {
ServiceReferenceHolder.getInstance().setDistributedObjectProvider(new HazelcastDistributedObjectProvider());
ServiceReferenceHolder.getInstance().setAxisConfiguration(axisConfiguration);
- CloudControllerContext cloudControllerContext = CloudControllerContext.getInstance();
+ CloudControllerContext cloudControllerContext = CloudControllerContext.getInstance();
+
+ Thread t1 = new Thread(new MemberAdder(cloudControllerContext));
+ t1.start();
+ t1.join();
+ assertEquals(2, cloudControllerContext.getMemberContextsOfClusterId("cluster-1").size());
- Thread t1 = new Thread(new MemberAdder(cloudControllerContext));
- t1.start();
- t1.join();
- assertEquals(2, cloudControllerContext.getMemberContextsOfClusterId("cluster-1").size());
+ Thread t2 = new Thread(new MemberRemover(cloudControllerContext));
+ t2.start();
+ t2.join();
+ assertEquals(1, cloudControllerContext.getMemberContextsOfClusterId("cluster-1").size());
- Thread t2 = new Thread(new MemberRemover(cloudControllerContext));
- t2.start();
- t2.join();
- assertEquals(1, cloudControllerContext.getMemberContextsOfClusterId("cluster-1").size());
-
}
class MemberAdder implements Runnable {
-
- private CloudControllerContext dataHolder;
- public MemberAdder(CloudControllerContext data) {
- this.dataHolder = data;
- }
- @Override
- public void run() {
- MemberContext ctxt1 = new MemberContext("application-1", "cartridge-1", "cluster-1", "member-1");
- MemberContext ctxt2 = new MemberContext("application-1", "cartridge-1", "cluster-1", "member-2");
- MemberContext ctxt3 = new MemberContext("application-1", "cartridge-1", "cluster-2", "member-3");
- dataHolder.addMemberContext(ctxt1);
- dataHolder.addMemberContext(ctxt2);
- dataHolder.addMemberContext(ctxt3);
- }
+
+ private CloudControllerContext dataHolder;
+
+ public MemberAdder(CloudControllerContext data) {
+ this.dataHolder = data;
+ }
+
+ @Override
+ public void run() {
+ MemberContext ctxt1 = new MemberContext("application-1", "cartridge-1", "cluster-1", "member-1");
+ MemberContext ctxt2 = new MemberContext("application-1", "cartridge-1", "cluster-1", "member-2");
+ MemberContext ctxt3 = new MemberContext("application-1", "cartridge-1", "cluster-2", "member-3");
+ dataHolder.addMemberContext(ctxt1);
+ dataHolder.addMemberContext(ctxt2);
+ dataHolder.addMemberContext(ctxt3);
+ }
}
-
+
class MemberRemover implements Runnable {
-
- private CloudControllerContext dataHolder;
- public MemberRemover(CloudControllerContext cloudControllerContext) {
- this.dataHolder = cloudControllerContext;
- }
+ private CloudControllerContext dataHolder;
+
+ public MemberRemover(CloudControllerContext cloudControllerContext) {
+ this.dataHolder = cloudControllerContext;
+ }
- @Override
- public void run() {
- dataHolder.removeMemberContext("cluster-1", "member-1");
- }
+ @Override
+ public void run() {
+ dataHolder.removeMemberContext("cluster-1", "member-1");
+ }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-1.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-1.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-1.xml
index 60930fe..2d31871 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-1.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-1.xml
@@ -21,35 +21,35 @@
-->
<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
-
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php" host="abc.com" provider="carbon">
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
- <property name="ss" value="slsls"/>
- <property name="ss" value="slsls"/>
- <description>This is a php cartridge.</description>
- <deployment baseDir="xyz">
- <dir>abc</dir>
- </deployment>
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="instanceType" value="1"/>
- <property name="payload" value="resources/as.txt"/>
- </iaasProvider>
- <iaasProvider type="ec2" >
- <imageId>xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="securityGroups" value="manager,cep,mb,default"/>
- <property name="instanceType" value="m1.large"/>
- <property name="payload" value="resources/as-ec2.txt"/>
- </iaasProvider>
-
- </cartridge>
-
- </cartridges>
+<cartridges>
+
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="php" host="abc.com" provider="carbon">
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+ <property name="ss" value="slsls"/>
+ <property name="ss" value="slsls"/>
+ <description>This is a php cartridge.</description>
+ <deployment baseDir="xyz">
+ <dir>abc</dir>
+ </deployment>
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="instanceType" value="1"/>
+ <property name="payload" value="resources/as.txt"/>
+ </iaasProvider>
+ <iaasProvider type="ec2">
+ <imageId>xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="securityGroups" value="manager,cep,mb,default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="payload" value="resources/as-ec2.txt"/>
+ </iaasProvider>
+
+ </cartridge>
+
+</cartridges>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-2.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-2.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-2.xml
index 0872097..ac89e87 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-2.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-2.xml
@@ -20,36 +20,36 @@
-->
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php">
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
- <property name="ss" value="slsls"/>
-
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="instanceType" value="1"/>
- <property name="payload" value="resources/as.txt"/>
- </iaasProvider>
- <iaasProvider type="ec2" >
- <imageId>xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="securityGroups" value="manager,cep,mb,default"/>
- <property name="instanceType" value="m1.large"/>
- <property name="payload" value="resources/as-ec2.txt"/>
- </iaasProvider>
-
- <deployment>
- <dir>abc/def</dir>
- </deployment>
-
- <appTypes>
- <appType name="axis2services" appSpecificMapping="true"/>
- <appType name="webapps" appSpecificMapping="false"/>
- </appTypes>
- </cartridge>
+<!-- You can have 1..n cartridge elements. -->
+<cartridge type="php">
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+ <property name="ss" value="slsls"/>
+
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="instanceType" value="1"/>
+ <property name="payload" value="resources/as.txt"/>
+ </iaasProvider>
+ <iaasProvider type="ec2">
+ <imageId>xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="securityGroups" value="manager,cep,mb,default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="payload" value="resources/as-ec2.txt"/>
+ </iaasProvider>
+
+ <deployment>
+ <dir>abc/def</dir>
+ </deployment>
+
+ <appTypes>
+ <appType name="axis2services" appSpecificMapping="true"/>
+ <appType name="webapps" appSpecificMapping="false"/>
+ </appTypes>
+</cartridge>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-3.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-3.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-3.xml
index b3da31f..d6bb7d0 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-3.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-3.xml
@@ -21,18 +21,18 @@
-->
<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
-
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php">
-
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
- <property name="ss" value="slsls"/>
-
- <deployment>
- <dir>abc</dir>
- </deployment>
- </cartridge>
-
- </cartridges>
+<cartridges>
+
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="php">
+
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+ <property name="ss" value="slsls"/>
+
+ <deployment>
+ <dir>abc</dir>
+ </deployment>
+ </cartridge>
+
+</cartridges>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-4.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-4.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-4.xml
index 285d99d..496e373 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-4.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-4.xml
@@ -21,34 +21,34 @@
-->
<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
-
- <!-- You can have 1..n cartridge elements. -->
- <cartridge>
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
- <property name="ss" value="slsls"/>
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="instanceType" value="1"/>
- <property name="payload" value="resources/as.txt"/>
- </iaasProvider>
- <iaasProvider type="ec2" >
- <imageId>xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="securityGroups" value="manager,cep,mb,default"/>
- <property name="instanceType" value="m1.large"/>
- <property name="payload" value="resources/as-ec2.txt"/>
- </iaasProvider>
-
- <deployment>
- <dir>abc</dir>
- <dir>def</dir>
- </deployment>
- </cartridge>
-
- </cartridges>
+<cartridges>
+
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge>
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+ <property name="ss" value="slsls"/>
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="instanceType" value="1"/>
+ <property name="payload" value="resources/as.txt"/>
+ </iaasProvider>
+ <iaasProvider type="ec2">
+ <imageId>xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="securityGroups" value="manager,cep,mb,default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="payload" value="resources/as-ec2.txt"/>
+ </iaasProvider>
+
+ <deployment>
+ <dir>abc</dir>
+ <dir>def</dir>
+ </deployment>
+ </cartridge>
+
+</cartridges>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-5.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-5.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-5.xml
index cb7efe6..65dadaa 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-5.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-5.xml
@@ -21,31 +21,31 @@
-->
<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
-
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php">
-
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="instanceType" value="1"/>
- <property name="payload" value="resources/as.txt"/>
- </iaasProvider>
- <iaasProvider type="ec2" >
- <imageId>xxxxxxxxxx</imageId>
- <property name="keyPair" value="aa"/>
- <property name="securityGroups" value="manager,cep,mb,default"/>
- <property name="instanceType" value="m1.large"/>
- <property name="payload" value="resources/as-ec2.txt"/>
- </iaasProvider>
-
- <deployment>
- <dir>abc</dir>
- </deployment>
- </cartridge>
-
- </cartridges>
+<cartridges>
+
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="php">
+
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="instanceType" value="1"/>
+ <property name="payload" value="resources/as.txt"/>
+ </iaasProvider>
+ <iaasProvider type="ec2">
+ <imageId>xxxxxxxxxx</imageId>
+ <property name="keyPair" value="aa"/>
+ <property name="securityGroups" value="manager,cep,mb,default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="payload" value="resources/as-ec2.txt"/>
+ </iaasProvider>
+
+ <deployment>
+ <dir>abc</dir>
+ </deployment>
+ </cartridge>
+
+</cartridges>
http://git-wip-us.apache.org/repos/asf/stratos/blob/de76b388/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-6.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-6.xml b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-6.xml
index 15ca74a..6f42c4e 100644
--- a/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-6.xml
+++ b/components/org.apache.stratos.cloud.controller/src/test/resources/cartridges-6.xml
@@ -21,21 +21,21 @@
-->
<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
-
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php">
-
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="openstack" >
- <imageId>nova/xxxxxxxxxx</imageId>
- </iaasProvider>
-
- <deployment>
- <dir>abc</dir>
- </deployment>
- </cartridge>
-
- </cartridges>
+<cartridges>
+
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="php">
+
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="openstack">
+ <imageId>nova/xxxxxxxxxx</imageId>
+ </iaasProvider>
+
+ <deployment>
+ <dir>abc</dir>
+ </deployment>
+ </cartridge>
+
+</cartridges>