Repository: stratos Updated Branches: refs/heads/master 0968c9f25 -> 89e7bfb93
http://git-wip-us.apache.org/repos/asf/stratos/blob/26070cb4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/revokesecuritygroupingressresponse.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/revokesecuritygroupingressresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/revokesecuritygroupingressresponse.json deleted file mode 100644 index 4530108..0000000 --- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/revokesecuritygroupingressresponse.json +++ /dev/null @@ -1,2 +0,0 @@ - { "revokesecuritygroupingressresponse" : - {"jobid":"13330fc9-8b3e-4582-aa3e-90883c041010"} } http://git-wip-us.apache.org/repos/asf/stratos/blob/26070cb4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/stopvirtualmachineresponse-imageextension.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/stopvirtualmachineresponse-imageextension.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/stopvirtualmachineresponse-imageextension.json deleted file mode 100644 index b526cd1..0000000 --- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/stopvirtualmachineresponse-imageextension.json +++ /dev/null @@ -1 +0,0 @@ -{ "stopvirtualmachineresponse" : {"jobid":"a7d5127b-24a2-4a44-a4a7-25a6d057b453"} } http://git-wip-us.apache.org/repos/asf/stratos/blob/26070cb4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateclusterresponse.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateclusterresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateclusterresponse.json deleted file mode 100644 index 4a03ca3..0000000 --- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateclusterresponse.json +++ /dev/null @@ -1 +0,0 @@ -{ "updateclusterresponse" : { "cluster" : {"warning":"this test data is fabricated","id":1,"name":"Xen Clust 1","podid":1,"podname":"Dev Pod 1","zoneid":1,"zonename":"Dev Zone 1","hypervisortype":"XenServer","clustertype":"CloudManaged","allocationstate":"Enabled","managedstate":"Managed"} } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/26070cb4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateconfigurationsresponse.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateconfigurationsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateconfigurationsresponse.json deleted file mode 100644 index 6013bd5..0000000 --- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateconfigurationsresponse.json +++ /dev/null @@ -1,2 +0,0 @@ -{ "updateconfigurationresponse" : { "configuration" : - {"category":"Advanced","name":"expunge.delay","value":"11","description":"Determines how long (in seconds) to wait before actually expunging destroyed vm. The default value = the default value of expunge.interval"} } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/26070cb4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatedomainresponse.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatedomainresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatedomainresponse.json deleted file mode 100644 index 1745eac..0000000 --- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatedomainresponse.json +++ /dev/null @@ -1,2 +0,0 @@ -{ "updatedomainresponse" : { "domain" : - {"id":10,"name":"test-2","level":1,"parentdomainid":1,"parentdomainname":"ROOT","haschild":false} } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/26070cb4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatehostresponse.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatehostresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatehostresponse.json deleted file mode 100644 index cb70ddd..0000000 --- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatehostresponse.json +++ /dev/null @@ -1,2 +0,0 @@ -{ "updatehostresponse" : { "host" : - {"warning":"This test data is fabricated","id":1,"name":"cs2-xevsrv.alucloud.local","state":"Up","type":"Routing","ipaddress":"10.26.26.107","zoneid":1,"zonename":"Dev Zone 1","podid":1,"podname":"Dev Pod 1","version":"2.2.12.20110928142833","hypervisor":"XenServer","cpunumber":24,"cpuspeed":2266,"cpuallocated":"2.76%","cpuused":"0.1%","cpuwithoverprovisioning":"54384.0","networkkbsread":4443,"networkkbswrite":15048,"memorytotal":100549733760,"memoryallocated":3623878656,"memoryused":3623878656,"capabilities":"xen-3.0-x86_64 , xen-3.0-x86_32p , hvm-3.0-x86_32 , hvm-3.0-x86_32p , hvm-3.0-x86_64","lastpinged":"1970-01-16T00:54:43+0200","managementserverid":223098941760041,"clusterid":1,"clustername":"Xen Clust 1","clustertype":"CloudManaged","islocalstorageactive":false,"created":"2011-11-26T23:28:36+0200","events":"PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping","hosttags":"","hasEnoughCapacity":false,"allocationstate":"Enabled"} } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/26070cb4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatepodresponse.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatepodresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatepodresponse.json deleted file mode 100644 index b9479a7..0000000 --- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatepodresponse.json +++ /dev/null @@ -1 +0,0 @@ -{ "updatepodresponse" : { "pod" : {"id":7,"name":"richard-updatedpod","zoneid":11,"zonename":"richard-zone","gateway":"172.21.0.254","netmask":"255.255.255.128","startip":"172.21.0.129","endip":"172.21.0.250","allocationstate":"Disabled"} } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/26070cb4/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatezoneresponse.json ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatezoneresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatezoneresponse.json deleted file mode 100644 index 240c49d..0000000 --- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatezoneresponse.json +++ /dev/null @@ -1,4 +0,0 @@ -{ "updatezoneresponse" : { "zone" : - {"id":6,"name":"test-zone","dns1":"8.8.8.8","internaldns1":"10.10.10.10","networktype":"Basic", - "securitygroupsenabled":true,"allocationstate":"Enabled","zonetoken":"7b6e27df-30a6-3024-9d8b-7971a3127f64", - "dhcpprovider":"DhcpServer"} } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/26070cb4/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml index a4cbbae..cbe63ec 100644 --- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml +++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml @@ -114,11 +114,6 @@ <artifactId>jclouds-enterprise</artifactId> <version>${jclouds.version}</version> </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>cloudstack</artifactId> - <version>${jclouds.version}</version> - </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>ec2</artifactId> http://git-wip-us.apache.org/repos/asf/stratos/blob/26070cb4/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml ---------------------------------------------------------------------- diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml index dd2306a..76ac074 100644 --- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml +++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml @@ -49,37 +49,6 @@ is not necessary [0..1]. But you can use this section to avoid specifying same property over and over again. --> <iaasProviders> - - <!--<iaasProvider type="cloudstack" name="cloudstack specific details"> - <className>org.apache.stratos.cloud.controller.iaases.CloudstackIaas</className> - <provider>cloudstack</provider> - <identity svns:secretAlias="cloud.controller.cloudstack.identity">api-key</identity> - <credential svns:secretAlias="cloud.controller.cloudstack.credential">secret-key</credential> - <property name="jclouds.endpoint" value="ip:port" /> - <property name="availabilityZone" value="zone_Id"/> - <property name="instanceType" value="instance_type_Id"/> - <property name="securityGroupIds" value="security_group_Id1,security_group_id2"/> - <property name="networkIds" value="network_Id1,network_Id2"/> - <property name="diskOffering" value="disk_offering_Id"/> - <property name="username" value="username"/> - <property name="domainId" value="domainId"/> - <property name="keyPair" value="asanka-key"/> - <property name="tags" value="tag1,tag2,tag3" /> - <property name="autoAssignIp" value="false" /> - </iaasProvider>--> - <!--iaasProvider type="ec2" name="ec2 specific details"> - <className>org.apache.stratos.cloud.controller.iaases.AWSEC2Iaas</className> - <provider>aws-ec2</provider> - <identity svns:secretAlias="cloud.controller.ec2.identity">dhsaghfdal</identity> - <credential svns:secretAlias="cloud.controller.ec2.credential">jdkjaskd</credential> - <scaleUpOrder>1</scaleUpOrder> - <scaleDownOrder>2</scaleDownOrder> - <property name="jclouds.ec2.ami-query" value="owner-id=XX-XX-XX;state=available;image-type=machine"/> - <property name="availabilityZone" value="us-east-1c"/> - <property name="securityGroups" value="manager,cep,mb,default"/> - <property name="instanceType" value="m1.large"/> - <property name="keyPair" value="nirmal-key"/> - </iaasProvider--> <!-- iaasProvider type="openstack" name="openstack specific details"> <className>org.apache.stratos.cloud.controller.iaases.OpenstackNovaIaas</className> <provider>openstack-nova</provider>
