You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2014/12/05 14:07:46 UTC
[1/2] git commit: updated refs/heads/master to 84aaef2
Repository: cloudstack
Updated Branches:
refs/heads/master 24aaf1923 -> 84aaef25d
CLOUDSTACK-8028: Fix test_data.py - Separate virtual_machine dict having userdata key
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/60200531
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/60200531
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/60200531
Branch: refs/heads/master
Commit: 602005311039cb0b13b2826b1012c7e5b4e25d9b
Parents: 24aaf19
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri Dec 5 15:31:43 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri Dec 5 18:37:22 2014 +0530
----------------------------------------------------------------------
.../component/test_security_groups.py | 52 ++++++++++----------
tools/marvin/marvin/config/test_data.py | 13 +++++
2 files changed, 39 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60200531/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index a644a1c..cc37921 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -76,8 +76,8 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
cls.testdata["ostype"]
)
cls.testdata["domainid"] = cls.domain.id
- cls.testdata["virtual_machine"]["zoneid"] = cls.zone.id
- cls.testdata["virtual_machine"]["template"] = template.id
+ cls.testdata["virtual_machine_userdata"]["zoneid"] = cls.zone.id
+ cls.testdata["virtual_machine_userdata"]["template"] = template.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
@@ -122,7 +122,7 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.testdata["virtual_machine"],
+ self.testdata["virtual_machine_userdata"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id
@@ -235,7 +235,7 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.testdata["virtual_machine"],
+ self.testdata["virtual_machine_userdata"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id
@@ -352,8 +352,8 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
cls.testdata["ostype"]
)
cls.testdata["domainid"] = cls.domain.id
- cls.testdata["virtual_machine"]["zoneid"] = cls.zone.id
- cls.testdata["virtual_machine"]["template"] = template.id
+ cls.testdata["virtual_machine_userdata"]["zoneid"] = cls.zone.id
+ cls.testdata["virtual_machine_userdata"]["template"] = template.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
@@ -437,7 +437,7 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
security_group.id)
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.testdata["virtual_machine"],
+ self.testdata["virtual_machine_userdata"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
@@ -492,8 +492,8 @@ class TestRevokeIngressRule(cloudstackTestCase):
cls.testdata["ostype"]
)
cls.testdata["domainid"] = cls.domain.id
- cls.testdata["virtual_machine"]["zoneid"] = cls.zone.id
- cls.testdata["virtual_machine"]["template"] = template.id
+ cls.testdata["virtual_machine_userdata"]["zoneid"] = cls.zone.id
+ cls.testdata["virtual_machine_userdata"]["template"] = template.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
@@ -581,7 +581,7 @@ class TestRevokeIngressRule(cloudstackTestCase):
ssh_rule = (ingress_rule["ingressrule"][0]).__dict__
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.testdata["virtual_machine"],
+ self.testdata["virtual_machine_userdata"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
@@ -655,8 +655,8 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
)
cls.testdata["domainid"] = cls.domain.id
- cls.testdata["virtual_machine"]["zoneid"] = cls.zone.id
- cls.testdata["virtual_machine"]["template"] = template.id
+ cls.testdata["virtual_machine_userdata"]["zoneid"] = cls.zone.id
+ cls.testdata["virtual_machine_userdata"]["template"] = template.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
@@ -669,7 +669,7 @@ class TestDhcpOnlyRouter(cloudstackTestCase):
)
cls.virtual_machine = VirtualMachine.create(
cls.api_client,
- cls.testdata["virtual_machine"],
+ cls.testdata["virtual_machine_userdata"],
accountid=cls.account.name,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
@@ -797,8 +797,8 @@ class TestdeployVMWithUserData(cloudstackTestCase):
)
cls.testdata["domainid"] = cls.domain.id
- cls.testdata["virtual_machine"]["zoneid"] = cls.zone.id
- cls.testdata["virtual_machine"]["template"] = template.id
+ cls.testdata["virtual_machine_userdata"]["zoneid"] = cls.zone.id
+ cls.testdata["virtual_machine_userdata"]["template"] = template.id
cls.service_offering = ServiceOffering.create(
cls.api_client,
@@ -900,7 +900,7 @@ class TestdeployVMWithUserData(cloudstackTestCase):
)
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.testdata["virtual_machine"],
+ self.testdata["virtual_machine_userdata"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
@@ -931,7 +931,7 @@ class TestdeployVMWithUserData(cloudstackTestCase):
res = str(result)
self.assertEqual(
- res.count(self.testdata["virtual_machine"]["userdata"]),
+ res.count(self.testdata["virtual_machine_userdata"]["userdata"]),
1,
"Verify user data"
)
@@ -957,8 +957,8 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
)
self.testdata["domainid"] = self.domain.id
- self.testdata["virtual_machine"]["zoneid"] = self.zone.id
- self.testdata["virtual_machine"]["template"] = template.id
+ self.testdata["virtual_machine_userdata"]["zoneid"] = self.zone.id
+ self.testdata["virtual_machine_userdata"]["template"] = template.id
self.service_offering = ServiceOffering.create(
self.apiclient,
@@ -1064,7 +1064,7 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.testdata["virtual_machine"],
+ self.testdata["virtual_machine_userdata"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
@@ -1147,7 +1147,7 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.testdata["virtual_machine"],
+ self.testdata["virtual_machine_userdata"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
@@ -1188,8 +1188,8 @@ class TestIngressRule(cloudstackTestCase):
)
self.testdata["domainid"] = self.domain.id
- self.testdata["virtual_machine"]["zoneid"] = self.zone.id
- self.testdata["virtual_machine"]["template"] = template.id
+ self.testdata["virtual_machine_userdata"]["zoneid"] = self.zone.id
+ self.testdata["virtual_machine_userdata"]["template"] = template.id
self.service_offering = ServiceOffering.create(
self.apiclient,
@@ -1293,7 +1293,7 @@ class TestIngressRule(cloudstackTestCase):
)
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.testdata["virtual_machine"],
+ self.testdata["virtual_machine_userdata"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
@@ -1412,7 +1412,7 @@ class TestIngressRule(cloudstackTestCase):
)
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.testdata["virtual_machine"],
+ self.testdata["virtual_machine_userdata"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
@@ -1567,7 +1567,7 @@ class TestIngressRule(cloudstackTestCase):
self.virtual_machine = VirtualMachine.create(
self.apiclient,
- self.testdata["virtual_machine"],
+ self.testdata["virtual_machine_userdata"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60200531/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 232a922..7daa22b 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -322,6 +322,19 @@ test_data = {
"affinity": {
"name": "webvms",
"type": "host anti-affinity",
+ }
+ },
+ "virtual_machine_userdata": {
+ "displayname": "Test VM",
+ "username": "root",
+ "password": "password",
+ "ssh_port": 22,
+ "privateport": 22,
+ "publicport": 22,
+ "protocol": "TCP",
+ "affinity": {
+ "name": "webvms",
+ "type": "host anti-affinity",
},
"userdata": "This is sample data"
},
[2/2] git commit: updated refs/heads/master to 84aaef2
Posted by ta...@apache.org.
CLOUDSTACK-8029: Remove unused kaypairs from test_data.py
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/84aaef25
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/84aaef25
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/84aaef25
Branch: refs/heads/master
Commit: 84aaef25d9b86b4b1ac193746a87a3dfc77a9c6f
Parents: 6020053
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri Dec 5 14:29:13 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri Dec 5 18:37:32 2014 +0530
----------------------------------------------------------------------
tools/marvin/marvin/config/test_data.py | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84aaef25/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 7daa22b..ce3baab 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -843,7 +843,6 @@ test_data = {
"page": 1,
"pagesize": 2,
"listall": 'true',
- "host_password": "password",
"advanced_sg": {
"zone": {
"name": "",
@@ -933,13 +932,6 @@ test_data = {
"forvirtualnetwork": "true",
"customdisksize": 1,
"diskname": "Test Volume",
- "portableIpRange": {
- "gateway": "10.223.252.195",
- "netmask": "255.255.255.192",
- "startip": "10.223.252.196",
- "endip": "10.223.252.197",
- "vlan": "1001"
- },
"sparse": {
"name": "Sparse Type Disk offering",
"displaytext":