You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/12/18 12:56:30 UTC
[10/40] git commit: updated refs/heads/master to f4133a7
CLOUDSTACK-8062: test_multiple_ip_ranges.py - Fix the test case to avoid using same vlan IP range in each test case
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/7ff118c9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ff118c9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ff118c9
Branch: refs/heads/master
Commit: 7ff118c90b80a51efea73f87ac70dc686d92753b
Parents: 9bfb8e5
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Thu Dec 11 12:41:46 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Dec 11 17:41:54 2014 +0530
----------------------------------------------------------------------
.../component/test_multiple_ip_ranges.py | 521 ++++++++++---------
tools/marvin/marvin/config/test_data.py | 8 +
2 files changed, 281 insertions(+), 248 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ff118c9/test/integration/component/test_multiple_ip_ranges.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_multiple_ip_ranges.py b/test/integration/component/test_multiple_ip_ranges.py
index 32c39f7..1beea4b 100644
--- a/test/integration/component/test_multiple_ip_ranges.py
+++ b/test/integration/component/test_multiple_ip_ranges.py
@@ -16,109 +16,41 @@
# under the License.
""" Tests for Multiple IP Ranges feature
"""
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
+from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackException import CloudstackAPIException
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from netaddr import *
-
+from marvin.lib.utils import cleanup_resources
+from marvin.lib.base import (PublicIpRange)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_pod)
+from netaddr import IPAddress, IPNetwork
+import random
from nose.plugins.attrib import attr
-class Services:
- """Test Multiple IP Ranges
- """
- def __init__(self):
- self.services = {
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended for unique
- # username
- "password": "password",
- },
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 200, # in MHz
- "memory": 256, # In MBs
- },
- "disk_offering": {
- "displaytext": "Small Disk",
- "name": "Small Disk",
- "disksize": 1
- },
- "templates": {
- "displaytext": 'Template',
- "name": 'Template',
- "ostype": "CentOS 5.3 (64-bit)",
- "templatefilter": 'self',
- },
- "vlan_ip_range": {
- "startip": "",
- "endip": "",
- "netmask": "",
- "gateway": "",
- "forvirtualnetwork": "false",
- "vlan": "untagged",
- },
- "ostype": "CentOS 5.3 (64-bit)",
- "sleep": 60,
- "timeout": 10,
- }
class TestMultipleIpRanges(cloudstackTestCase):
+
"""Test Multiple IP Ranges for guest network
"""
-
@classmethod
def setUpClass(cls):
cls.testClient = super(TestMultipleIpRanges, cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
- cls.services = Services().services
+ cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.pod = get_pod(cls.api_client, cls.zone.id)
- cls.services['mode'] = cls.zone.networktype
- cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
- cls.account = Account.create(
- cls.api_client,
- cls.services["account"],
- domainid=cls.domain.id
- )
- cls.services["account"] = cls.account.name
- cls.disk_offering = DiskOffering.create(
- cls.api_client,
- cls.services["disk_offering"]
- )
- cls.service_offering = ServiceOffering.create(
- cls.api_client,
- cls.services["service_offering"]
- )
- cls.template = get_template(
- cls.api_client,
- cls.zone.id,
- cls.services["ostype"]
- )
- cls.services["templates"]["ostypeid"] = cls.template.ostypeid
- cls.services["diskoffering"] = cls.disk_offering.id
- cls._cleanup = [
- cls.account,
- ]
+ cls._cleanup = []
return
@classmethod
def tearDownClass(cls):
try:
- #Cleanup resources used
+ # Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -127,12 +59,12 @@ class TestMultipleIpRanges(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
- self.cleanup = [ ]
+ self.cleanup = []
return
def tearDown(self):
try:
- #Clean up, terminate the resources created
+ # Clean up, terminate the resources created
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -146,86 +78,102 @@ class TestMultipleIpRanges(cloudstackTestCase):
self.endIp = publicIpRange[0].endip
self.gateway = publicIpRange[0].gateway
self.netmask = publicIpRange[0].netmask
- #Pass ip address and mask length to IPNetwork to findout the CIDR
- ip = IPNetwork(self.startIp+"/"+self.netmask)
- new_cidr = ip.__iadd__(1)
+ # Pass ip address and mask length to IPNetwork to findout the CIDR
+ ip = IPNetwork(self.startIp + "/" + self.netmask)
+ # Take random increment factor to avoid adding the same vlan ip range
+ # in each test case
+ networkIncrementFactor = random.randint(1,255)
+ new_cidr = ip.__iadd__(networkIncrementFactor)
ip2 = IPNetwork(new_cidr)
return ip2
- def verify_vlan_range(self,vlan,services):
- #compare vlan_list response with configured values
+ def verify_vlan_range(self, vlan, services):
+ # compare vlan_list response with configured values
self.assertEqual(
- isinstance(vlan, list),
- True,
- "Check list response returned a valid list"
- )
+ isinstance(vlan, list),
+ True,
+ "Check list response returned a valid list"
+ )
self.assertNotEqual(
- len(vlan),
- 0,
- "check list vlan response"
- )
+ len(vlan),
+ 0,
+ "check list vlan response"
+ )
self.assertEqual(
- str(vlan[0].startip),
- str(services["startip"]),
- "Start IP in vlan ip range is not matched with the configured start ip"
- )
+ str(vlan[0].startip),
+ str(services["startip"]),
+ "Start IP in vlan ip range is not matched with\
+ the configured start ip"
+ )
self.assertEqual(
- str(vlan[0].endip),
- str(services["endip"]),
- "End IP in vlan ip range is not matched with the configured end ip"
- )
+ str(vlan[0].endip),
+ str(services["endip"]),
+ "End IP in vlan ip range is not matched with\
+ the configured end ip"
+ )
self.assertEqual(
- str(vlan[0].gateway),
- str(services["gateway"]),
- "gateway in vlan ip range is not matched with the configured gateway"
- )
+ str(vlan[0].gateway),
+ str(services["gateway"]),
+ "gateway in vlan ip range is not matched with\
+ the configured gateway"
+ )
self.assertEqual(
- str(vlan[0].netmask),
- str(services["netmask"]),
- "netmask in vlan ip range is not matched with the configured netmask"
- )
+ str(vlan[0].netmask),
+ str(services["netmask"]),
+ "netmask in vlan ip range is not matched with\
+ the configured netmask"
+ )
return
@attr(tags=["sg"])
def test_01_add_ip_same_cidr(self):
"""Test add guest ip range in the existing cidr
"""
- #call increment_cidr function to get exiting cidr from the setup and increment it
+ # call increment_cidr function to get exiting cidr from the setup and
+ # increment it
ip2 = self.increment_cidr()
test_nw = ip2.network
ip = IPAddress(test_nw)
- #Add IP range(5 IPs) in the new CIDR
+ # Add IP range(5 IPs) in the new CIDR
test_gateway = ip.__add__(1)
test_startIp = ip.__add__(3)
test_endIp = ip.__add__(10)
- test_startIp2= ip.__add__(11)
+ test_startIp2 = ip.__add__(11)
test_endIp2 = ip.__add__(15)
- #Populating services with new IP range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp
self.services["vlan_ip_range"]["endip"] = test_endIp
self.services["vlan_ip_range"]["gateway"] = test_gateway
self.services["vlan_ip_range"]["netmask"] = self.netmask
self.services["vlan_ip_range"]["zoneid"] = self.zone.id
self.services["vlan_ip_range"]["podid"] = self.pod.id
- #create new vlan ip range
- self.debug("Creating new ip range with new cidr in the same vlan")
- new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
+ # create new vlan ip range
+ self.debug("Creating new ip range with new cidr in the same vlan")
+ new_vlan = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp, test_endIp))
self.cleanup.append(new_vlan)
- new_vlan_res = new_vlan.list(self.apiclient,id=new_vlan.vlan.id)
- #Compare list output with configured values
- self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
- #Add few more ips in the same CIDR
+ new_vlan_res = new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
+ # Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res, self.services["vlan_ip_range"])
+ # Add few more ips in the same CIDR
self.services["vlan_ip_range"]["startip"] = test_startIp2
self.services["vlan_ip_range"]["endip"] = test_endIp2
- self.debug("Creating new ip range in the existing CIDR")
- new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp2,test_endIp2))
+ self.debug("Creating new ip range in the existing CIDR")
+ new_vlan2 = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp2, test_endIp2))
self.cleanup.append(new_vlan2)
- #list new vlan ip range
- new_vlan2_res = new_vlan2.list(self.apiclient,id=new_vlan2.vlan.id)
- #Compare list output with configured values
- self.verify_vlan_range(new_vlan2_res,self.services["vlan_ip_range"])
+ # list new vlan ip range
+ new_vlan2_res = new_vlan2.list(self.apiclient, id=new_vlan2.vlan.id)
+ # Compare list output with configured values
+ self.verify_vlan_range(new_vlan2_res, self.services["vlan_ip_range"])
return
@attr(tags=["sg"])
@@ -236,29 +184,34 @@ class TestMultipleIpRanges(cloudstackTestCase):
1.Get public vlan range (guest cidr) from the setup
2.Add IP range to a new cidr
"""
- #call increment_cidr function to get exiting cidr from the setup and increment it
+ # call increment_cidr function to get exiting cidr from the setup and
+ # increment it
ip2 = self.increment_cidr()
test_nw = ip2.network
ip = IPAddress(test_nw)
- #Add IP range(5 IPs) in the new CIDR
+ # Add IP range(5 IPs) in the new CIDR
test_gateway = ip.__add__(1)
test_startIp = ip.__add__(3)
test_endIp = ip.__add__(10)
- #Populating services with new IP range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp
self.services["vlan_ip_range"]["endip"] = test_endIp
self.services["vlan_ip_range"]["gateway"] = test_gateway
self.services["vlan_ip_range"]["netmask"] = self.netmask
self.services["vlan_ip_range"]["zoneid"] = self.zone.id
self.services["vlan_ip_range"]["podid"] = self.pod.id
- #create new vlan ip range
- self.debug("Adding new ip range in different CIDR in same vlan")
- new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
+ # create new vlan ip range
+ self.debug("Adding new ip range in different CIDR in same vlan")
+ new_vlan = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp, test_endIp))
self.cleanup.append(new_vlan)
- new_vlan_res = new_vlan.list(self.apiclient,id=new_vlan.vlan.id)
- #Compare list output with configured values
- self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
+ new_vlan_res = new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
+ # Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res, self.services["vlan_ip_range"])
return
@attr(tags=["sg"])
@@ -270,37 +223,45 @@ class TestMultipleIpRanges(cloudstackTestCase):
2.delete the ip range added at step1
3.Verify the ip range deletion using list APIs
"""
- #call increment_cidr function to get exiting cidr from the setup and increment it
+ # call increment_cidr function to get exiting cidr from the setup and
+ # increment it
ip2 = self.increment_cidr()
test_nw = ip2.network
ip = IPAddress(test_nw)
- #Add IP range(5 IPs) in the new CIDR
+ # Add IP range(5 IPs) in the new CIDR
test_gateway = ip.__add__(1)
test_startIp = ip.__add__(3)
test_endIp = ip.__add__(10)
- #Populating services with new IP range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp
self.services["vlan_ip_range"]["endip"] = test_endIp
self.services["vlan_ip_range"]["gateway"] = test_gateway
self.services["vlan_ip_range"]["netmask"] = self.netmask
self.services["vlan_ip_range"]["zoneid"] = self.zone.id
self.services["vlan_ip_range"]["podid"] = self.pod.id
- #create new vlan ip range
- self.debug("Creating new ip range in the new cidr")
- new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
- new_vlan_res = new_vlan.list(self.apiclient,id=new_vlan.vlan.id)
- #Compare list output with configured values
- self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
- #Delete the above IP range
- self.debug("Deleting new ip range added in new cidr")
+ # create new vlan ip range
+ self.debug("Creating new ip range in the new cidr")
+ new_vlan = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp, test_endIp))
+ new_vlan_res = new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
+ # Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res, self.services["vlan_ip_range"])
+ # Delete the above IP range
+ self.debug("Deleting new ip range added in new cidr")
new_vlan.delete(self.apiclient)
- #listing vlan ip ranges with the id should through exception , if not mark the test case as failed
+ # listing vlan ip ranges with the id should through exception , if not
+ # mark the test case as failed
try:
new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
except CloudstackAPIException as cs:
self.debug(cs.errorMsg)
- self.assertTrue(cs.errorMsg.find("entity does not exist")>0, msg="Failed to delete IP range")
+ self.assertTrue(
+ cs.errorMsg.find("entity does not exist") > 0,
+ msg="Failed to delete IP range")
return
@attr(tags=["sg"])
@@ -311,42 +272,51 @@ class TestMultipleIpRanges(cloudstackTestCase):
1.Add non-contigous ip range in cidr added at step1
2.Verify the ip range using list APIs
"""
- #call increment_cidr function to get exiting cidr from the setup and increment it
+ # call increment_cidr function to get exiting cidr from the setup and
+ # increment it
ip2 = self.increment_cidr()
test_nw = ip2.network
ip = IPAddress(test_nw)
- #Add IP range(5 IPs) in the new CIDR
+ # Add IP range(5 IPs) in the new CIDR
test_gateway = ip.__add__(1)
test_startIp = ip.__add__(50)
test_endIp = ip.__add__(60)
- #Populating services with new IP range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp
self.services["vlan_ip_range"]["endip"] = test_endIp
self.services["vlan_ip_range"]["gateway"] = test_gateway
self.services["vlan_ip_range"]["netmask"] = self.netmask
self.services["vlan_ip_range"]["zoneid"] = self.zone.id
self.services["vlan_ip_range"]["podid"] = self.pod.id
- #create new vlan ip range
- new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
+ # create new vlan ip range
+ new_vlan = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp, test_endIp))
self.cleanup.append(new_vlan)
- new_vlan_res = new_vlan.list(self.apiclient,id=new_vlan.vlan.id)
- #Compare list output with configured values
- self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
- #Add non-contiguous ip range in exiting cidr
+ new_vlan_res = new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
+ # Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res, self.services["vlan_ip_range"])
+ # Add non-contiguous ip range in exiting cidr
test_startIp2 = ip.__add__(10)
test_endIp2 = ip.__add__(20)
- #Populating services with new IP range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp2
self.services["vlan_ip_range"]["endip"] = test_endIp2
- #create new vlan ip range
- self.debug("Adding non contiguous ip range")
- new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
+ # create new vlan ip range
+ self.debug("Adding non contiguous ip range")
+ new_vlan = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp, test_endIp))
self.cleanup.append(new_vlan)
- new_vlan_res = new_vlan.list(self.apiclient,id=new_vlan.vlan.id)
- #Compare list output with configured values
- self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
+ new_vlan_res = new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
+ # Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res, self.services["vlan_ip_range"])
return
@attr(tags=["sg"])
@@ -354,48 +324,64 @@ class TestMultipleIpRanges(cloudstackTestCase):
"""Test adding overlapped ip range in existing cidr
1.Add ip range in new cidr e.g:10.147.40.10-10.147.40.100
- 2.Add ip range overlapped with the ip range in step1 e.g.10.147.40.90-150
+ 2.Add ip range overlapped with the ip range in
+ step1 e.g.10.147.40.90-150
"""
- #call increment_cidr function to get exiting cidr from the setup and increment it
+ # call increment_cidr function to get exiting cidr from the setup and
+ # increment it
ip2 = self.increment_cidr()
test_nw = ip2.network
ip = IPAddress(test_nw)
- #Add IP range in the new CIDR
+ # Add IP range in the new CIDR
test_gateway = ip.__add__(1)
test_startIp = ip.__add__(10)
test_endIp = ip.__add__(30)
test_startIp2 = ip.__add__(20)
test_endIp2 = ip.__add__(40)
- #Populating services with new IP range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp
self.services["vlan_ip_range"]["endip"] = test_endIp
self.services["vlan_ip_range"]["gateway"] = test_gateway
self.services["vlan_ip_range"]["netmask"] = self.netmask
self.services["vlan_ip_range"]["zoneid"] = self.zone.id
self.services["vlan_ip_range"]["podid"] = self.pod.id
- #create new vlan ip range
- self.debug("Creating new ip range with startip:%s and endip: %s".format(test_startIp,test_endIp))
- new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
+ # create new vlan ip range
+ self.debug(
+ "Creating new ip range with startip:%s and endip: %s".format(
+ test_startIp,
+ test_endIp))
+ new_vlan = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp, test_endIp))
self.cleanup.append(new_vlan)
- new_vlan_res = new_vlan.list(self.apiclient,id=new_vlan.vlan.id)
- #Compare list output with configured values
- self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
- #Add overlapped ip range
- #Populating services with new IP range
+ new_vlan_res = new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
+ # Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res, self.services["vlan_ip_range"])
+ # Add overlapped ip range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp2
self.services["vlan_ip_range"]["endip"] = test_endIp2
- #Try to create ip range overlapped with exiting ip range
- self.debug("Adding overlapped ip range")
+ # Try to create ip range overlapped with exiting ip range
+ self.debug("Adding overlapped ip range")
try:
- new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
+ new_vlan2 = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
except CloudstackAPIException as cs:
self.debug(cs.errorMsg)
- self.assertTrue(cs.errorMsg.find("already has IPs that overlap with the new range")>0, msg="Fail:CS allowed adding overlapped ip ranges in guest cidr")
+ self.assertTrue(
+ cs.errorMsg.find("already has IPs that overlap with the new range") > 0,
+ msg="Fail:CS allowed adding overlapped ip\
+ ranges in guest cidr")
return
- #Test will reach here if there is a bug in overlap ip range checking
+ # Test will reach here if there is a bug in overlap ip range checking
self.cleanup.append(new_vlan2)
- self.fail("CS should not accept overlapped ip ranges in guest traffic, but it allowed")
+ self.fail(
+ "CS should not accept overlapped ip ranges in\
+ guest traffic, but it allowed")
return
@attr(tags=["sg"])
@@ -403,14 +389,17 @@ class TestMultipleIpRanges(cloudstackTestCase):
"""Test adding overlapped ip range with two existing cidr
1.Add ip range in new cidr e.g:10.147.40.2-10.147.40.10
- 2.Add another ip range in the same cidr e.g:10.147.40.20-10.147.40.30
- 2.Add ip range overlapped with both the ip ranges e.g.10.147.40.10-20
+ 2.Add another ip range in the same cidr
+ e.g:10.147.40.20-10.147.40.30
+ 3.Add ip range overlapped with both the ip ranges
+ e.g.10.147.40.10-20
"""
- #call increment_cidr function to get exiting cidr from the setup and increment it
+ # call increment_cidr function to get exiting cidr from the setup and
+ # increment it
ip2 = self.increment_cidr()
test_nw = ip2.network
ip = IPAddress(test_nw)
- #Add IP range in the new CIDR
+ # Add IP range in the new CIDR
test_gateway = ip.__add__(1)
test_startIp = ip.__add__(2)
test_endIp = ip.__add__(5)
@@ -418,40 +407,55 @@ class TestMultipleIpRanges(cloudstackTestCase):
test_endIp2 = ip.__add__(10)
test_startIp3 = ip.__add__(5)
test_endIp3 = ip.__add__(7)
- #Populating services with new IP range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp
self.services["vlan_ip_range"]["endip"] = test_endIp
self.services["vlan_ip_range"]["gateway"] = test_gateway
self.services["vlan_ip_range"]["netmask"] = self.netmask
self.services["vlan_ip_range"]["zoneid"] = self.zone.id
self.services["vlan_ip_range"]["podid"] = self.pod.id
- #create new vlan ip range
- new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
+ # create new vlan ip range
+ new_vlan = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp, test_endIp))
self.cleanup.append(new_vlan)
- new_vlan_res = new_vlan.list(self.apiclient,id=new_vlan.vlan.id)
- #Compare list output with configured values
- self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
- #Add 2nd IP range in the same CIDR
+ new_vlan_res = new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
+ # Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res, self.services["vlan_ip_range"])
+ # Add 2nd IP range in the same CIDR
self.services["vlan_ip_range"]["startip"] = test_startIp2
self.services["vlan_ip_range"]["endip"] = test_endIp2
- new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp2,test_endIp2))
+ new_vlan2 = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp2, test_endIp2))
self.cleanup.append(new_vlan2)
- #Populating services with new IP range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp3
self.services["vlan_ip_range"]["endip"] = test_endIp3
- #Try to create ip range overlapped with exiting ip range
- self.debug("Adding ip range overlapped with two cidrs")
+ # Try to create ip range overlapped with exiting ip range
+ self.debug("Adding ip range overlapped with two cidrs")
try:
- new_vlan3 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
+ new_vlan3 = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
except CloudstackAPIException as cs:
self.debug(cs.errorMsg)
- self.assertTrue(cs.errorMsg.find("already has IPs that overlap with the new range")>0, msg="Fail:CS allowed adding overlapped ip ranges in guest cidr")
+ self.assertTrue(
+ cs.errorMsg.find("already has IPs that overlap with the new range") > 0,
+ msg="Fail:CS allowed adding overlapped ip\
+ ranges in guest cidr")
return
- #Test will reach here if there is a bug in overlap ip range checking
+ # Test will reach here if there is a bug in overlap ip range checking
self.cleanup.append(new_vlan3)
- self.fail("CS should not accept overlapped ip ranges in guest traffic, but it allowed")
+ self.fail(
+ "CS should not accept overlapped ip ranges in guest\
+ traffic, but it allowed")
return
@attr(tags=["sg"])
@@ -461,50 +465,61 @@ class TestMultipleIpRanges(cloudstackTestCase):
1.Add IP range in new CIDR
2.Try to add ip range superset to CIDR added in step1
"""
- #call increment_cidr function to get exiting cidr from the setup and increment it
+ # call increment_cidr function to get exiting cidr from the setup and
+ # increment it
ip2 = self.increment_cidr()
test_nw = ip2.network
ip = IPAddress(test_nw)
- #Add IP range in the new CIDR
+ # Add IP range in the new CIDR
test_gateway = ip.__add__(1)
test_startIp = ip.__add__(2)
test_endIp = ip.__add__(10)
test_startIp2 = ip.__add__(20)
test_endIp2 = ip.__add__(30)
- #Populating services with new IP range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp
self.services["vlan_ip_range"]["endip"] = test_endIp
self.services["vlan_ip_range"]["gateway"] = test_gateway
self.services["vlan_ip_range"]["netmask"] = self.netmask
self.services["vlan_ip_range"]["zoneid"] = self.zone.id
self.services["vlan_ip_range"]["podid"] = self.pod.id
- #create new vlan ip range
- new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
+ # create new vlan ip range
+ new_vlan = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp, test_endIp))
self.cleanup.append(new_vlan)
- new_vlan_res = new_vlan.list(self.apiclient,id=new_vlan.vlan.id)
- #Compare list output with configured values
- self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
- #Add ip range superset to the existing CIDR
- #Following code finds the netmask superset to existing CIDR
+ new_vlan_res = new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
+ # Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res, self.services["vlan_ip_range"])
+ # Add ip range superset to the existing CIDR
+ # Following code finds the netmask superset to existing CIDR
cidr = ip2.cidr
- mask_len = 2**(32-cidr.prefixlen)
+ mask_len = 2 ** (32 - cidr.prefixlen)
netmask = IPAddress(self.netmask)
superset = netmask.__isub__(mask_len)
- #Add this superset netmask to services
+ # Add this superset netmask to services
self.services["vlan_ip_range"]["netmask"] = superset
self.services["vlan_ip_range"]["startip"] = test_startIp2
self.services["vlan_ip_range"]["endip"] = test_endIp2
- self.debug("Adding IP range super set to existing CIDR")
+ self.debug("Adding IP range super set to existing CIDR")
try:
- new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
+ new_vlan2 = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
except CloudstackAPIException as cs:
self.debug(cs.errorMsg)
- self.assertTrue(cs.errorMsg.find("superset")>0, msg="Fail: CS allowed adding ip range superset to existing CIDR")
+ self.assertTrue(
+ cs.errorMsg.find("superset") > 0,
+ msg="Fail: CS allowed adding ip range\
+ superset to existing CIDR")
return
- #Test will reach here if there is a bug in allowing superset ip range
+ # Test will reach here if there is a bug in allowing superset ip range
self.cleanup.append(new_vlan2)
- self.fail("CS should not allow adding ip range superset to existing CIDR")
+ self.fail(
+ "CS should not allow adding ip range superset to existing CIDR")
return
@attr(tags=["sg"])
@@ -514,48 +529,58 @@ class TestMultipleIpRanges(cloudstackTestCase):
1.Add IP range in new CIDR
2.Try to add ip range subset to CIDR added in step1
"""
- #call increment_cidr function to get exiting cidr from the setup and increment it
+ # call increment_cidr function to get exiting cidr from the setup and
+ # increment it
ip2 = self.increment_cidr()
test_nw = ip2.network
ip = IPAddress(test_nw)
- #Add IP range in the new CIDR
+ # Add IP range in the new CIDR
test_gateway = ip.__add__(1)
test_startIp = ip.__add__(2)
test_endIp = ip.__add__(10)
test_startIp2 = ip.__add__(20)
test_endIp2 = ip.__add__(30)
- #Populating services with new IP range
+ # Populating services with new IP range
self.services["vlan_ip_range"]["startip"] = test_startIp
self.services["vlan_ip_range"]["endip"] = test_endIp
self.services["vlan_ip_range"]["gateway"] = test_gateway
self.services["vlan_ip_range"]["netmask"] = self.netmask
self.services["vlan_ip_range"]["zoneid"] = self.zone.id
self.services["vlan_ip_range"]["podid"] = self.pod.id
- #create new vlan ip range
- new_vlan = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
- self.debug("Created new vlan range with startip:%s and endip:%s" %(test_startIp,test_endIp))
+ # create new vlan ip range
+ new_vlan = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
+ self.debug(
+ "Created new vlan range with startip:%s and endip:%s" %
+ (test_startIp, test_endIp))
self.cleanup.append(new_vlan)
- new_vlan_res = new_vlan.list(self.apiclient,id=new_vlan.vlan.id)
- #Compare list output with configured values
- self.verify_vlan_range(new_vlan_res,self.services["vlan_ip_range"])
- #Add ip range superset to the existing CIDR
- #Following code finds the netmask superset to existing CIDR
+ new_vlan_res = new_vlan.list(self.apiclient, id=new_vlan.vlan.id)
+ # Compare list output with configured values
+ self.verify_vlan_range(new_vlan_res, self.services["vlan_ip_range"])
+ # Add ip range superset to the existing CIDR
+ # Following code finds the netmask superset to existing CIDR
cidr = ip2.cidr
- mask_len = 2**(32-(cidr.prefixlen+1))
+ mask_len = 2 ** (32 - (cidr.prefixlen + 1))
netmask = IPAddress(self.netmask)
subset = netmask.__iadd__(mask_len)
- #Add this superset netmask to services
+ # Add this superset netmask to services
self.services["vlan_ip_range"]["netmask"] = subset
self.services["vlan_ip_range"]["startip"] = test_startIp2
self.services["vlan_ip_range"]["endip"] = test_endIp2
- self.debug("Adding ip range subset to existing cidr")
+ self.debug("Adding ip range subset to existing cidr")
try:
- new_vlan2 = PublicIpRange.create(self.apiclient, self.services["vlan_ip_range"])
+ new_vlan2 = PublicIpRange.create(
+ self.apiclient,
+ self.services["vlan_ip_range"])
except CloudstackAPIException as cs:
self.debug(cs.errorMsg)
- self.assertTrue(cs.errorMsg.find("subset")>0, msg="Fail: CS allowed adding ip range subset to existing CIDR")
+ self.assertTrue(
+ cs.errorMsg.find("subset") > 0,
+ msg="Fail: CS allowed adding ip range subset to existing CIDR")
return
- #Test will reach here if there is a bug in allowing superset ip range
+ # Test will reach here if there is a bug in allowing superset ip range
self.cleanup.append(new_vlan2)
- self.fail("CS should not allow adding ip range subset to existing CIDR")
+ self.fail(
+ "CS should not allow adding ip range subset to existing CIDR")
return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ff118c9/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 4b50afa..5a468fe 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -829,6 +829,14 @@ test_data = {
"epslifetime": "3600",
"dpd": "false"
},
+ "vlan_ip_range": {
+ "startip": "",
+ "endip": "",
+ "netmask": "",
+ "gateway": "",
+ "forvirtualnetwork": "false",
+ "vlan": "untagged",
+ },
"ostype": "CentOS 5.6 (64-bit)",
"sleep": 90,
"timeout": 10,