etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing test_escalations_ipaddresses.py - Passing type Isolated while listing Networks to avoid inclusion of shared networks in the list

This commit is contained in:
Gaurav Aradhye 2014-07-30 20:29:09 +05:30 committed by Girish Shilamkar
parent 74862fada5
commit cfbbc81a82
3 changed files with 73 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/component/test_escalations_instances.py
View File

@ -1658,7 +1658,8 @@ class TestListInstances(cloudstackTestCase):
isdefault="true",
zoneid=self.zone.id,
account=self.account.name,
domainid=self.domain.id
domainid=self.domain.id,
type="Isolated"
)
status = validateList(list_network_before)
self.assertEquals(
@ -1699,13 +1700,13 @@ class TestListInstances(cloudstackTestCase):
network2,
"Network creation failed"
)
self.cleanup.append(network2)
# Listing all the networks again
list_network_after = Network.list(
self.userapiclient,
zoneid=self.zone.id,
account=self.account.name,
domainid=self.domain.id
domainid=self.domain.id,
type="Isolated"
)
status = validateList(list_network_after)
self.assertEquals(
@ -3231,7 +3232,8 @@ class TestInstances(cloudstackTestCase):
# Listing all the networks available
networks_list_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
networks_list_size = 0
if networks_list_before is not None:
@ -3272,7 +3274,8 @@ class TestInstances(cloudstackTestCase):
# Listing the networks again
networks_list_after = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
status = validateList(network_offerings_list)
self.assertEquals(

40
test/integration/component/test_escalations_ipaddresses.py
View File

@ -165,6 +165,7 @@ class TestIpAddresses(cloudstackTestCase):
forvpc="false",
domainid=self.domain.id,
account=self.account.name,
type="Isolated"
)
self.assertIsNone(
networks_list_before,
@ -205,6 +206,7 @@ class TestIpAddresses(cloudstackTestCase):
forvpc="false",
domainid=self.domain.id,
account=self.account.name,
type="Isolated"
)
status = validateList(networks_list_after)
self.assertEquals(
@ -331,6 +333,7 @@ class TestIpAddresses(cloudstackTestCase):
forvpc="false",
domainid=self.domain.id,
account=self.account.name,
type="Isolated"
)
self.assertIsNone(
networks_list_before,
@ -371,6 +374,7 @@ class TestIpAddresses(cloudstackTestCase):
forvpc="false",
domainid=self.domain.id,
account=self.account.name,
type="Isolated"
)
status = validateList(networks_list_after)
self.assertEquals(
@ -656,7 +660,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(
@ -1032,7 +1037,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(
@ -1071,7 +1077,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing Networks again
list_networks_after = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
status = validateList(list_networks_after)
self.assertEquals(
@ -1238,7 +1245,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(
@ -1547,7 +1555,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(
@ -1586,7 +1595,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing Networks again
list_networks_after = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
status = validateList(list_networks_after)
self.assertEquals(
@ -1784,7 +1794,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(
@ -2231,7 +2242,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(
@ -2406,7 +2418,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(
@ -2580,7 +2593,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(
@ -2787,7 +2801,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(
@ -3169,7 +3184,8 @@ class TestIpAddresses(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.services["listall"]
listall=self.services["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(

61
test/integration/component/test_escalations_networks.py
View File

@ -164,7 +164,8 @@ class TestNetworks_1(cloudstackTestCase):
# Listing the networks for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.test_data["listall"]
listall=self.test_data["listall"],
type="Isolated"
)
# Verifying listed networks for account created at class level
if list_networks_before is None:
@ -210,7 +211,7 @@ class TestNetworks_1(cloudstackTestCase):
"more than 1 network created at class level"
)
# Listing the networks
list_networks_after = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_after = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
status = validateList(list_networks_after)
self.assertEquals(PASS, status[0], "No networks found using list call")
# Asserting for the length of the networks
@ -224,7 +225,8 @@ class TestNetworks_1(cloudstackTestCase):
self.userapiclient,
listall=self.test_data["listall"],
page=1,
pagesize=self.test_data["pagesize"]
pagesize=self.test_data["pagesize"],
type="Isolated"
)
status = validateList(list_networks_page1)
self.assertEquals(PASS, status[0], "No networks found at page 1")
@ -238,7 +240,8 @@ class TestNetworks_1(cloudstackTestCase):
self.userapiclient,
listall=self.test_data["listall"],
page=2,
pagesize=self.test_data["pagesize"]
pagesize=self.test_data["pagesize"],
type="Isolated"
)
status = validateList(list_networks_page2)
self.assertEquals(PASS, status[0], "No networks found at page 2")
@ -598,7 +601,7 @@ class TestNetworks_1(cloudstackTestCase):
"VPC is not created"
)
# Listing the networks for a user
list_networks_before = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_before = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
# Verifying listed networks for account created at class level
self.assertIsNotNone(list_networks_before, "Network create failed at class level")
# List network offering for vpc = true
@ -615,7 +618,8 @@ class TestNetworks_1(cloudstackTestCase):
self.assertEquals(PASS, status[0], "Default network offering not present for vpc = true")
# Listing networks in VPC
list_networks_in_vpc = Network.list(self.userapiclient,
vpcid=vpc_1.id
vpcid=vpc_1.id,
type="Isolated"
)
self.assertIsNone(list_networks_in_vpc, "Networks found for newly created VPC")
# If number of networks is 1, then creating network
@ -661,7 +665,7 @@ class TestNetworks_1(cloudstackTestCase):
"more than 1 network created at class level"
)
# Listing the networks
list_networks_after = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_after = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
status = validateList(list_networks_after)
self.assertEquals(PASS, status[0], "No networks found using list call")
# Asserting for the length of the networks
@ -672,7 +676,8 @@ class TestNetworks_1(cloudstackTestCase):
)
# Listing networks in VPC after creation of network
list_networks_in_vpc = Network.list(self.userapiclient,
vpcid=vpc_1.id
vpcid=vpc_1.id,
type="Isolated"
)
status = validateList(list_networks_in_vpc)
self.assertEquals(PASS, status[0], "No networks found in vpc")
@ -709,7 +714,7 @@ class TestNetworks_1(cloudstackTestCase):
Step4 : Verify network is deleted
"""
# Listing the networks for a user
list_networks_before = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_before = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
# Verifying listed networks for account created at class level
self.assertIsNotNone(list_networks_before, "Network create failed at class level")
# List network offering for vpc = false
@ -762,7 +767,8 @@ class TestNetworks_1(cloudstackTestCase):
# Listing the networks
list_networks_after = Network.list(
self.userapiclient,
listall=self.test_data["listall"]
listall=self.test_data["listall"],
type="Isolated"
)
status = validateList(list_networks_after)
self.assertEquals(PASS, status[0], "No networks found using list call")
@ -777,7 +783,8 @@ class TestNetworks_1(cloudstackTestCase):
# List Networks
list_networks_after_delete = Network.list(
self.userapiclient,
listall=self.test_data["listall"]
listall=self.test_data["listall"],
type="Isolated"
)
status = validateList(list_networks_after_delete)
self.assertEquals(PASS, status[0], "No networks found using list call")
@ -805,7 +812,7 @@ class TestNetworks_1(cloudstackTestCase):
Step4 : Verify network is updated
"""
# Listing the networks for a user
list_networks_before = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_before = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
# Verifying listed networks for account created at class level
self.assertIsNotNone(list_networks_before, "Network create failed at class level")
self.assertEquals(
@ -855,7 +862,7 @@ class TestNetworks_1(cloudstackTestCase):
"Listed network details are not as expected"
)
# Listing the networks
list_networks_after = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_after = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
status = validateList(list_networks_after)
self.assertEquals(PASS, status[0], "No networks found using list call")
# Asserting for the length of the networks
@ -872,7 +879,7 @@ class TestNetworks_1(cloudstackTestCase):
networkdomain="cs13cloud.internal.new"
)
# List Networks
list_networks_after_update = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_after_update = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
status = validateList(list_networks_after_update)
self.assertEquals(PASS, status[0], "No networks found using list call")
self.assertEqual(
@ -913,7 +920,7 @@ class TestNetworks_1(cloudstackTestCase):
Step4 : Verify list Virtual machines and pagination
"""
# Listing the networks for a user
list_networks_before = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_before = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
# Verifying listed networks for account created at class level
self.assertIsNotNone(list_networks_before, "Network create failed at class level")
# Create Virtual Machine
@ -1071,7 +1078,7 @@ class TestNetworks_1(cloudstackTestCase):
"VPC is not created"
)
# Listing the networks for a user
list_networks_before = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_before = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
# Verifying listed networks for account created at class level
self.assertIsNotNone(list_networks_before, "Network create failed at class level")
# List network offering for vpc = true
@ -1127,7 +1134,7 @@ class TestNetworks_1(cloudstackTestCase):
"more than 1 network created at class level"
)
# Listing the networks
list_networks_after = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_after = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
status = validateList(list_networks_after)
self.assertEquals(PASS, status[0], "No networks found using list call")
# Asserting for the length of the networks
@ -1140,7 +1147,8 @@ class TestNetworks_1(cloudstackTestCase):
list_networks_in_vpc = Network.list(
self.userapiclient,
listall=self.test_data["listall"],
vpcid=vpc_1.id
vpcid=vpc_1.id,
type="Isolated"
)
status = validateList(list_networks_in_vpc)
self.assertEquals(PASS, status[0], "No networks found using list call")
@ -1304,7 +1312,8 @@ class TestNetworks_1(cloudstackTestCase):
# Listing the networks for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.test_data["listall"]
listall=self.test_data["listall"],
type="Isolated"
)
# Verifying listed networks for account created at class level
self.assertIsNotNone(list_networks_before, "Network create failed at class level")
@ -1322,7 +1331,8 @@ class TestNetworks_1(cloudstackTestCase):
self.assertEquals(PASS, status[0], "Default network offering not present for vpc = true")
# Listing networks in VPC
list_networks_in_vpc = Network.list(self.userapiclient,
vpcid=vpc_1.id
vpcid=vpc_1.id,
type="Isolated"
)
self.assertIsNone(list_networks_in_vpc, "Networks found for newly created VPC")
# If number of networks is 1, then creating network
@ -1368,7 +1378,7 @@ class TestNetworks_1(cloudstackTestCase):
"more than 1 network created at class level"
)
# Listing the networks
list_networks_after = Network.list(self.userapiclient, listall=self.test_data["listall"])
list_networks_after = Network.list(self.userapiclient, listall=self.test_data["listall"], type="Isolated")
status = validateList(list_networks_after)
self.assertEquals(PASS, status[0], "No networks found using list call")
# Asserting for the length of the networks
@ -1379,7 +1389,8 @@ class TestNetworks_1(cloudstackTestCase):
)
# Listing networks in VPC after creation of network
list_networks_in_vpc = Network.list(self.userapiclient,
vpcid=vpc_1.id
vpcid=vpc_1.id,
type="Isolated"
)
status = validateList(list_networks_in_vpc)
self.assertEquals(PASS, status[0], "No networks found in vpc")
@ -1888,7 +1899,8 @@ class TestNetworks_2(cloudstackTestCase):
# Listing all the Networks's for a user
list_networks_before = Network.list(
self.userapiclient,
listall=self.test_data["listall"]
listall=self.test_data["listall"],
type="Isolated"
)
# Verifying No Networks are listed
self.assertIsNone(
@ -1925,7 +1937,8 @@ class TestNetworks_2(cloudstackTestCase):
# Listing Networks after
list_networks_after = Network.list(
self.userapiclient,
listall=self.test_data["listall"]
listall=self.test_data["listall"],
type="Isolated"
)
status = validateList(list_networks_after)
self.assertEquals(