CLOUDSTACK-8028: Fix test_data.py - Separate virtual_machine dict having userdata key
Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a72b6a7f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a72b6a7f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a72b6a7f Branch: refs/heads/4.5 Commit: a72b6a7f999e028f1056e8aa4c1ef7d2b2f2d3da Parents: 2d7f0c6 Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Fri Dec 5 15:31:43 2014 +0530 Committer: SrikanteswaraRao Talluri <tall...@apache.org> Committed: Fri Dec 5 18:36:19 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/a72b6a7f/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/a72b6a7f/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 d644dc3..2877f56 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" },
