You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/09/18 23:13:46 UTC
[1/2] move certain tests which can not run in parallel
Repository: cloudstack
Updated Branches:
refs/heads/pytest 7c19ad3f1 -> eedbe4fee
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eedbe4fe/test/integration/smokeseq/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smokeseq/test_network.py b/test/integration/smokeseq/test_network.py
new file mode 100644
index 0000000..26d887e
--- /dev/null
+++ b/test/integration/smokeseq/test_network.py
@@ -0,0 +1,974 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+""" BVT tests for Network Life Cycle
+"""
+#Import Local Modules
+import marvin
+from marvin.codes import FAILED
+from marvin.cloudstackException import CloudstackAPIException
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.sshClient import SshClient
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
+import pytest
+#Import System modules
+import time
+
+_multiprocess_shared_ = True
+
+
+class TestPublicIP(cloudstackTestCase):
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+
+ @classmethod
+ def setUpClass(cls):
+ testClient = super(TestPublicIP, cls).getClsTestClient()
+ cls.apiclient = testClient.getApiClient()
+ cls.services = testClient.getParsedTestDataConfig()
+
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.apiclient)
+ cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+ cls.services['mode'] = cls.zone.networktype
+ # Create Accounts & networks
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
+
+ cls.user = Account.create(
+ cls.apiclient,
+ cls.services["account"],
+ domainid=cls.domain.id
+ )
+ cls.services["network"]["zoneid"] = cls.zone.id
+
+ cls.network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["network_offering"],
+ )
+ # Enable Network offering
+ cls.network_offering.update(cls.apiclient, state='Enabled')
+
+ cls.services["network"]["networkoffering"] = cls.network_offering.id
+ cls.account_network = Network.create(
+ cls.apiclient,
+ cls.services["network"],
+ cls.account.name,
+ cls.account.domainid
+ )
+ cls.user_network = Network.create(
+ cls.apiclient,
+ cls.services["network"],
+ cls.user.name,
+ cls.user.domainid
+ )
+
+ # Create Source NAT IP addresses
+ account_src_nat_ip = PublicIPAddress.create(
+ cls.apiclient,
+ cls.account.name,
+ cls.zone.id,
+ cls.account.domainid
+ )
+ user_src_nat_ip = PublicIPAddress.create(
+ cls.apiclient,
+ cls.user.name,
+ cls.zone.id,
+ cls.user.domainid
+ )
+ cls._cleanup = [
+ cls.account_network,
+ cls.user_network,
+ cls.account,
+ cls.user,
+ cls.network_offering
+ ]
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ #Cleanup resources used
+ cleanup_resources(cls.apiclient, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+
+ @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="false")
+ def test_public_ip_admin_account(self):
+ """Test for Associate/Disassociate public IP address for admin account"""
+
+ # Validate the following:
+ # 1. listPubliIpAddresses API returns the list of acquired addresses
+ # 2. the returned list should contain our acquired IP address
+
+ ip_address = PublicIPAddress.create(
+ self.apiclient,
+ self.account.name,
+ self.zone.id,
+ self.account.domainid
+ )
+ list_pub_ip_addr_resp = list_publicIP(
+ self.apiclient,
+ id=ip_address.ipaddress.id
+ )
+ self.assertEqual(
+ isinstance(list_pub_ip_addr_resp, list),
+ True,
+ "Check list response returns a valid list"
+ )
+ #listPublicIpAddresses should return newly created public IP
+ self.assertNotEqual(
+ len(list_pub_ip_addr_resp),
+ 0,
+ "Check if new IP Address is associated"
+ )
+ self.assertEqual(
+ list_pub_ip_addr_resp[0].id,
+ ip_address.ipaddress.id,
+ "Check Correct IP Address is returned in the List Cacls"
+ )
+
+ ip_address.delete(self.apiclient)
+ time.sleep(self.services["sleep"])
+
+
+ # Validate the following:
+ # 1.listPublicIpAddresses should no more return the released address
+ list_pub_ip_addr_resp = list_publicIP(
+ self.apiclient,
+ id=ip_address.ipaddress.id
+ )
+ if list_pub_ip_addr_resp is None:
+ return
+ if (list_pub_ip_addr_resp) and (isinstance(list_pub_ip_addr_resp, list)) and (len(list_pub_ip_addr_resp) > 0):
+ self.fail("list public ip response is not empty")
+ return
+
+ @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="false")
+ def test_public_ip_user_account(self):
+ """Test for Associate/Disassociate public IP address for user account"""
+
+ # Validate the following:
+ # 1. listPubliIpAddresses API returns the list of acquired addresses
+ # 2. the returned list should contain our acquired IP address
+
+ ip_address = PublicIPAddress.create(
+ self.apiclient,
+ self.user.name,
+ self.zone.id,
+ self.user.domainid
+ )
+
+ #listPublicIpAddresses should return newly created public IP
+ list_pub_ip_addr_resp = list_publicIP(
+ self.apiclient,
+ id=ip_address.ipaddress.id
+ )
+ self.assertEqual(
+ isinstance(list_pub_ip_addr_resp, list),
+ True,
+ "Check list response returns a valid list"
+ )
+ self.assertNotEqual(
+ len(list_pub_ip_addr_resp),
+ 0,
+ "Check if new IP Address is associated"
+ )
+ self.assertEqual(
+ list_pub_ip_addr_resp[0].id,
+ ip_address.ipaddress.id,
+ "Check Correct IP Address is returned in the List Call"
+ )
+
+ ip_address.delete(self.apiclient)
+
+ list_pub_ip_addr_resp = list_publicIP(
+ self.apiclient,
+ id=ip_address.ipaddress.id
+ )
+
+ self.assertEqual(
+ list_pub_ip_addr_resp,
+ None,
+ "Check if disassociated IP Address is no longer available"
+ )
+ return
+
+
+class TestPortForwarding(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+
+ testClient = super(TestPortForwarding, cls).getClsTestClient()
+ cls.apiclient = testClient.getApiClient()
+ cls.services = testClient.getParsedTestDataConfig()
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.apiclient)
+ cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+ template = get_template(
+ cls.apiclient,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
+ if template == FAILED:
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
+
+ #Create an account, network, VM and IP addresses
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
+ cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+ cls.service_offering = ServiceOffering.create(
+ cls.apiclient,
+ cls.services["service_offerings"]
+ )
+ cls.virtual_machine = VirtualMachine.create(
+ cls.apiclient,
+ cls.services["virtual_machine"],
+ templateid=template.id,
+ accountid=cls.account.name,
+ domainid=cls.account.domainid,
+ serviceofferingid=cls.service_offering.id
+ )
+ cls._cleanup = [
+ cls.virtual_machine,
+ cls.account,
+ cls.service_offering
+ ]
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.cleanup = []
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ cls.apiclient = super(TestPortForwarding, cls).getClsTestClient().getApiClient()
+ cleanup_resources(cls.apiclient, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+
+ def tearDown(self):
+ cleanup_resources(self.apiclient, self.cleanup)
+ return
+
+ @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="true")
+ def test_01_port_fwd_on_src_nat(self):
+ """Test for port forwarding on source NAT"""
+
+ #Validate the following:
+ #1. listPortForwarding rules API should return the added PF rule
+ #2. attempt to do an ssh into the user VM through the sourceNAT
+
+ src_nat_ip_addrs = list_publicIP(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+
+ self.assertEqual(
+ isinstance(src_nat_ip_addrs, list),
+ True,
+ "Check list response returns a valid list"
+ )
+ src_nat_ip_addr = src_nat_ip_addrs[0]
+
+ # Check if VM is in Running state before creating NAT rule
+ vm_response = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine.id
+ )
+
+ self.assertEqual(
+ isinstance(vm_response, list),
+ True,
+ "Check list VM returns a valid list"
+ )
+
+ self.assertNotEqual(
+ len(vm_response),
+ 0,
+ "Check Port Forwarding Rule is created"
+ )
+ self.assertEqual(
+ vm_response[0].state,
+ 'Running',
+ "VM state should be Running before creating a NAT rule."
+ )
+ # Open up firewall port for SSH
+ fw_rule = FireWallRule.create(
+ self.apiclient,
+ ipaddressid=src_nat_ip_addr.id,
+ protocol=self.services["natrule"]["protocol"],
+ cidrlist=['0.0.0.0/0'],
+ startport=self.services["natrule"]["publicport"],
+ endport=self.services["natrule"]["publicport"]
+ )
+
+ #Create NAT rule
+ nat_rule = NATRule.create(
+ self.apiclient,
+ self.virtual_machine,
+ self.services["natrule"],
+ src_nat_ip_addr.id
+ )
+
+ list_nat_rule_response = list_nat_rules(
+ self.apiclient,
+ id=nat_rule.id
+ )
+ self.assertEqual(
+ isinstance(list_nat_rule_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+
+ self.assertNotEqual(
+ len(list_nat_rule_response),
+ 0,
+ "Check Port Forwarding Rule is created"
+ )
+ self.assertEqual(
+ list_nat_rule_response[0].id,
+ nat_rule.id,
+ "Check Correct Port forwarding Rule is returned"
+ )
+ #SSH virtual machine to test port forwarding
+ try:
+ self.debug("SSHing into VM with IP address %s with NAT IP %s" %
+ (
+ self.virtual_machine.ipaddress,
+ src_nat_ip_addr.ipaddress
+ ))
+
+ self.virtual_machine.get_ssh_client(src_nat_ip_addr.ipaddress)
+ vm_response = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine.id
+ )
+ if vm_response[0].state != 'Running':
+ self.fail("State of VM : %s is not found to be Running" % str(self.virtual_machine.ipaddress))
+
+ except Exception as e:
+ self.fail(
+ "SSH Access failed for %s: %s" % \
+ (self.virtual_machine.ipaddress, e)
+ )
+
+ try:
+ nat_rule.delete(self.apiclient)
+ except Exception as e:
+ self.fail("NAT Rule Deletion Failed: %s" % e)
+
+ # NAT rule listing should fail as the nat rule does not exist
+ with self.assertRaises(Exception):
+ list_nat_rules(self.apiclient,
+ id=nat_rule.id)
+
+ # Check if the Public SSH port is inaccessible
+ with self.assertRaises(Exception):
+ self.debug(
+ "SSHing into VM with IP address %s after NAT rule deletion" %
+ self.virtual_machine.ipaddress)
+
+ SshClient(
+ src_nat_ip_addr.ipaddress,
+ self.virtual_machine.ssh_port,
+ self.virtual_machine.username,
+ self.virtual_machine.password
+ )
+ return
+
+ @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="true")
+ def test_02_port_fwd_on_non_src_nat(self):
+ """Test for port forwarding on non source NAT"""
+
+ #Validate the following:
+ #1. listPortForwardingRules should not return the deleted rule anymore
+ #2. attempt to do ssh should now fail
+
+ ip_address = PublicIPAddress.create(
+ self.apiclient,
+ self.account.name,
+ self.zone.id,
+ self.account.domainid,
+ self.services["virtual_machine"]
+ )
+ self.cleanup.append(ip_address)
+
+ # Check if VM is in Running state before creating NAT rule
+ vm_response = VirtualMachine.list(
+ self.apiclient,
+ id=self.virtual_machine.id
+ )
+
+ self.assertEqual(
+ isinstance(vm_response, list),
+ True,
+ "Check list VM returns a valid list"
+ )
+
+ self.assertNotEqual(
+ len(vm_response),
+ 0,
+ "Check Port Forwarding Rule is created"
+ )
+ self.assertEqual(
+ vm_response[0].state,
+ 'Running',
+ "VM state should be Running before creating a NAT rule."
+ )
+ # Open up firewall port for SSH
+ fw_rule = FireWallRule.create(
+ self.apiclient,
+ ipaddressid=ip_address.ipaddress.id,
+ protocol=self.services["natrule"]["protocol"],
+ cidrlist=['0.0.0.0/0'],
+ startport=self.services["natrule"]["publicport"],
+ endport=self.services["natrule"]["publicport"]
+ )
+ #Create NAT rule
+ nat_rule = NATRule.create(
+ self.apiclient,
+ self.virtual_machine,
+ self.services["natrule"],
+ ip_address.ipaddress.id
+ )
+ #Validate the following:
+ #1. listPortForwardingRules should not return the deleted rule anymore
+ #2. attempt to do ssh should now fail
+
+ list_nat_rule_response = list_nat_rules(
+ self.apiclient,
+ id=nat_rule.id
+ )
+ self.assertEqual(
+ isinstance(list_nat_rule_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+ self.assertNotEqual(
+ len(list_nat_rule_response),
+ 0,
+ "Check Port Forwarding Rule is created"
+ )
+ self.assertEqual(
+ list_nat_rule_response[0].id,
+ nat_rule.id,
+ "Check Correct Port forwarding Rule is returned"
+ )
+
+ try:
+ self.debug("SSHing into VM with IP address %s with NAT IP %s" %
+ (
+ self.virtual_machine.ipaddress,
+ ip_address.ipaddress.ipaddress
+ ))
+ self.virtual_machine.get_ssh_client(ip_address.ipaddress.ipaddress)
+ except Exception as e:
+ self.fail(
+ "SSH Access failed for %s: %s" % \
+ (self.virtual_machine.ipaddress, e)
+ )
+
+ nat_rule.delete(self.apiclient)
+
+ try:
+ list_nat_rule_response = list_nat_rules(
+ self.apiclient,
+ id=nat_rule.id
+ )
+ except CloudstackAPIException:
+ self.debug("Nat Rule is deleted")
+
+ # Check if the Public SSH port is inaccessible
+ with self.assertRaises(Exception):
+ self.debug(
+ "SSHing into VM with IP address %s after NAT rule deletion" %
+ self.virtual_machine.ipaddress)
+
+ SshClient(
+ ip_address.ipaddress.ipaddress,
+ self.virtual_machine.ssh_port,
+ self.virtual_machine.username,
+ self.virtual_machine.password,
+ retries=2,
+ delay=0
+ )
+ return
+
+
+
+
+class TestRebootRouter(cloudstackTestCase):
+
+ def setUp(self):
+
+ self.apiclient = self.testClient.getApiClient()
+ self.services = self.testClient.getParsedTestDataConfig()
+
+ # Get Zone, Domain and templates
+ self.domain = get_domain(self.apiclient)
+ self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
+ template = get_template(
+ self.apiclient,
+ self.zone.id,
+ self.services["ostype"]
+ )
+ if template == FAILED:
+ self.fail("get_template() failed to return template with description %s" % self.services["ostype"])
+ self.services["virtual_machine"]["zoneid"] = self.zone.id
+
+ #Create an account, network, VM and IP addresses
+ self.account = Account.create(
+ self.apiclient,
+ self.services["account"],
+ admin=True,
+ domainid=self.domain.id
+ )
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offerings"]
+ )
+ self.vm_1 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ templateid=template.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id
+ )
+
+ # Wait for VM to come up
+ time.sleep(self.services["sleep"])
+
+
+ src_nat_ip_addrs = list_publicIP(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ try:
+ src_nat_ip_addr = src_nat_ip_addrs[0]
+ except Exception as e:
+ raise Exception("Warning: Exception during fetching source NAT: %s" % e)
+
+ self.public_ip = PublicIPAddress.create(
+ self.apiclient,
+ self.vm_1.account,
+ self.vm_1.zoneid,
+ self.vm_1.domainid,
+ self.services["virtual_machine"]
+ )
+ #Open up firewall port for SSH
+ fw_rule = FireWallRule.create(
+ self.apiclient,
+ ipaddressid=self.public_ip.ipaddress.id,
+ protocol=self.services["lbrule"]["protocol"],
+ cidrlist=['0.0.0.0/0'],
+ startport=self.services["lbrule"]["publicport"],
+ endport=self.services["lbrule"]["publicport"]
+ )
+
+ lb_rule = LoadBalancerRule.create(
+ self.apiclient,
+ self.services["lbrule"],
+ src_nat_ip_addr.id,
+ self.account.name
+ )
+ lb_rule.assign(self.apiclient, [self.vm_1])
+ self.nat_rule = NATRule.create(
+ self.apiclient,
+ self.vm_1,
+ self.services["natrule"],
+ ipaddressid=self.public_ip.ipaddress.id
+ )
+ self.cleanup = [self.nat_rule,
+ lb_rule,
+ self.vm_1,
+ self.service_offering,
+ self.account,
+ ]
+ return
+
+ @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="true")
+ def test_reboot_router(self):
+ """Test for reboot router"""
+
+ #Validate the Following
+ #1. Post restart PF and LB rules should still function
+ #2. verify if the ssh into the virtual machine
+ # still works through the sourceNAT Ip
+
+ #Retrieve router for the user account
+
+ self.debug("Public IP: %s" % self.vm_1.ssh_ip)
+ self.debug("Public IP: %s" % self.public_ip.ipaddress.ipaddress)
+ routers = list_routers(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.assertEqual(
+ isinstance(routers, list),
+ True,
+ "Check list routers returns a valid list"
+ )
+
+ router = routers[0]
+
+ self.debug("Rebooting the router (ID: %s)" % router.id)
+
+ cmd = rebootRouter.rebootRouterCmd()
+ cmd.id = router.id
+ self.apiclient.rebootRouter(cmd)
+
+ # Poll listVM to ensure VM is stopped properly
+ timeout = self.services["timeout"]
+
+ while True:
+ time.sleep(self.services["sleep"])
+
+ # Ensure that VM is in stopped state
+ list_vm_response = list_virtual_machines(
+ self.apiclient,
+ id=self.vm_1.id
+ )
+
+ if isinstance(list_vm_response, list):
+
+ vm = list_vm_response[0]
+ if vm.state == 'Running':
+ self.debug("VM state: %s" % vm.state)
+ break
+
+ if timeout == 0:
+ raise Exception(
+ "Failed to start VM (ID: %s) in change service offering" % vm.id)
+
+ timeout = timeout - 1
+
+ #we should be able to SSH after successful reboot
+ try:
+ self.debug("SSH into VM (ID : %s ) after reboot" % self.vm_1.id)
+
+ SshClient(
+ self.public_ip.ipaddress.ipaddress,
+ self.services["natrule"]["publicport"],
+ self.vm_1.username,
+ self.vm_1.password
+ )
+ except Exception as e:
+ self.fail(
+ "SSH Access failed for %s: %s" % \
+ (self.public_ip.ipaddress.ipaddress, e))
+ return
+
+ def tearDown(self):
+ cleanup_resources(self.apiclient, self.cleanup)
+ return
+
+
+class TestReleaseIP(cloudstackTestCase):
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.services = self.testClient.getParsedTestDataConfig()
+
+ # Get Zone, Domain and templates
+ self.domain = get_domain(self.apiclient)
+ self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
+ template = get_template(
+ self.apiclient,
+ self.zone.id,
+ self.services["ostype"]
+ )
+ self.services["virtual_machine"]["zoneid"] = self.zone.id
+
+ #Create an account, network, VM, Port forwarding rule, LB rules
+ self.account = Account.create(
+ self.apiclient,
+ self.services["account"],
+ admin=True,
+ domainid=self.domain.id
+ )
+
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offerings"]
+ )
+
+ self.virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ templateid=template.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id
+ )
+
+ self.ip_address = PublicIPAddress.create(
+ self.apiclient,
+ self.account.name,
+ self.zone.id,
+ self.account.domainid
+ )
+
+ ip_addrs = list_publicIP(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ issourcenat=False
+ )
+ try:
+ self.ip_addr = ip_addrs[0]
+ except Exception as e:
+ raise Exception("Failed: During acquiring source NAT for account: %s" %
+ self.account.name)
+
+ self.nat_rule = NATRule.create(
+ self.apiclient,
+ self.virtual_machine,
+ self.services["natrule"],
+ self.ip_addr.id
+ )
+ self.lb_rule = LoadBalancerRule.create(
+ self.apiclient,
+ self.services["lbrule"],
+ self.ip_addr.id,
+ accountid=self.account.name
+ )
+ self.cleanup = [
+ self.virtual_machine,
+ self.account
+ ]
+ return
+
+ def tearDown(self):
+ cleanup_resources(self.apiclient, self.cleanup)
+
+ @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="false")
+ def test_releaseIP(self):
+ """Test for release public IP address"""
+
+ self.debug("Deleting Public IP : %s" % self.ip_addr.id)
+
+ self.ip_address.delete(self.apiclient)
+
+ retriesCount = 10
+ isIpAddressDisassociated = False
+ while retriesCount > 0:
+ listResponse = list_publicIP(
+ self.apiclient,
+ id=self.ip_addr.id
+ )
+ if listResponse is None:
+ isIpAddressDisassociated = True
+ break
+ retriesCount -= 1
+ time.sleep(self.services["sleep"])
+
+ # End while
+
+ self.assertTrue(isIpAddressDisassociated, "Failed to disassociate IP address")
+
+ # ListPortForwardingRules should not list
+ # associated rules with Public IP address
+ try:
+ list_nat_rule = list_nat_rules(
+ self.apiclient,
+ id=self.nat_rule.id
+ )
+ self.debug("List NAT Rule response" + str(list_nat_rule))
+ except CloudstackAPIException:
+ self.debug("Port Forwarding Rule is deleted")
+
+ # listLoadBalancerRules should not list
+ # associated rules with Public IP address
+ try:
+ list_lb_rule = list_lb_rules(
+ self.apiclient,
+ id=self.lb_rule.id
+ )
+ self.debug("List LB Rule response" + str(list_lb_rule))
+ except CloudstackAPIException:
+ self.debug("Port Forwarding Rule is deleted")
+
+ # SSH Attempt though public IP should fail
+ with self.assertRaises(Exception):
+ ssh_2 = SshClient(
+ self.ip_addr.ipaddress,
+ self.services["natrule"]["publicport"],
+ self.virtual_machine.username,
+ self.virtual_machine.password,
+ retries=2,
+ delay=0
+ )
+ return
+
+
+class TestDeleteAccount(cloudstackTestCase):
+
+ def setUp(self):
+
+ self.apiclient = self.testClient.getApiClient()
+ self.services = self.testClient.getParsedTestDataConfig()
+
+ # Get Zone, Domain and templates
+ self.domain = get_domain(self.apiclient)
+ self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
+ template = get_template(
+ self.apiclient,
+ self.zone.id,
+ self.services["ostype"]
+ )
+ self.services["virtual_machine"]["zoneid"] = self.zone.id
+
+ #Create an account, network, VM and IP addresses
+ self.account = Account.create(
+ self.apiclient,
+ self.services["account"],
+ admin=True,
+ domainid=self.domain.id
+ )
+ self.service_offering = ServiceOffering.create(
+ self.apiclient,
+ self.services["service_offerings"]
+ )
+ self.vm_1 = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ templateid=template.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id
+ )
+
+ src_nat_ip_addrs = list_publicIP(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+
+ try:
+ src_nat_ip_addr = src_nat_ip_addrs[0]
+ except Exception as e:
+ self.fail("SSH failed for VM with IP: %s" %
+ src_nat_ip_addr.ipaddress)
+
+ self.lb_rule = LoadBalancerRule.create(
+ self.apiclient,
+ self.services["lbrule"],
+ src_nat_ip_addr.id,
+ self.account.name
+ )
+ self.lb_rule.assign(self.apiclient, [self.vm_1])
+
+ self.nat_rule = NATRule.create(
+ self.apiclient,
+ self.vm_1,
+ self.services["natrule"],
+ src_nat_ip_addr.id
+ )
+ self.cleanup = []
+ return
+
+ @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="false")
+ def test_delete_account(self):
+ """Test for delete account"""
+
+ #Validate the Following
+ # 1. after account.cleanup.interval (global setting)
+ # time all the PF/LB rules should be deleted
+ # 2. verify that list(LoadBalancer/PortForwarding)Rules
+ # API does not return any rules for the account
+ # 3. The domR should have been expunged for this account
+
+ self.account.delete(self.apiclient)
+ interval = list_configurations(
+ self.apiclient,
+ name='account.cleanup.interval'
+ )
+ self.assertEqual(
+ isinstance(interval, list),
+ True,
+ "Check if account.cleanup.interval config present"
+ )
+ # Sleep to ensure that all resources are deleted
+ time.sleep(int(interval[0].value))
+
+ # ListLoadBalancerRules should not list
+ # associated rules with deleted account
+ # Unable to find account testuser1 in domain 1 : Exception
+ try:
+ list_lb_reponse = list_lb_rules(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ except CloudstackAPIException:
+ self.debug("Port Forwarding Rule is deleted")
+
+ # ListPortForwardingRules should not
+ # list associated rules with deleted account
+ try:
+ list_nat_reponse = list_nat_rules(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ except CloudstackAPIException:
+ self.debug("NATRule is deleted")
+
+ #Retrieve router for the user account
+ try:
+ routers = list_routers(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.assertEqual(
+ routers,
+ None,
+ "Check routers are properly deleted."
+ )
+ except CloudstackAPIException:
+ self.debug("Router is deleted")
+
+ except Exception as e:
+ raise Exception(
+ "Encountered %s raised while fetching routers for account: %s" % (e,
+ self.account.name))
+ return
+
+ def tearDown(self):
+ cleanup_resources(self.apiclient, self.cleanup)
+ return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eedbe4fe/test/integration/smokeseq/test_non_contigiousvlan.py
----------------------------------------------------------------------
diff --git a/test/integration/smokeseq/test_non_contigiousvlan.py b/test/integration/smokeseq/test_non_contigiousvlan.py
new file mode 100644
index 0000000..bc7cd16
--- /dev/null
+++ b/test/integration/smokeseq/test_non_contigiousvlan.py
@@ -0,0 +1,84 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#from marvin.cloudstackAPI import *
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.lib.base import PhysicalNetwork
+from marvin.lib.common import setNonContiguousVlanIds, get_zone
+import pytest
+
+
+class TestUpdatePhysicalNetwork(cloudstackTestCase):
+ """
+ Test to extend physical network vlan range
+ """
+ def setUp(self):
+ self.apiClient = self.testClient.getApiClient()
+ self.zone = get_zone(self.apiClient, self.testClient.getZoneForTests())
+ self.physicalnetwork, self.vlan = setNonContiguousVlanIds(self.apiClient, self.zone.id)
+
+ self.physicalnetworkid = self.physicalnetwork.id
+ self.existing_vlan = self.physicalnetwork.vlan
+
+ if self.vlan is None:
+ raise Exception("Failed to set non contiguous vlan ids to test. Free some ids from \
+ from existing physical networks at ends")
+
+ @pytest.mark.tags(tags = ["advanced"], required_hardware="false")
+ def test_extendPhysicalNetworkVlan(self):
+ """
+ Test to update a physical network and extend its vlan
+ """
+ phy_networks = PhysicalNetwork.list(self.apiClient)
+ self.assertNotEqual(len(phy_networks), 0,
+ msg="There are no physical networks in the zone")
+
+ self.network = phy_networks[0]
+ self.networkid = phy_networks[0].id
+ self.existing_vlan = phy_networks[0].vlan
+ vlan1 = self.existing_vlan+","+self.vlan["partial_range"][0]
+ updatePhysicalNetworkResponse = self.network.update(self.apiClient, id = self.networkid, vlan = vlan1)
+ self.assert_(updatePhysicalNetworkResponse is not None,
+ msg="couldn't extend the physical network with vlan %s"%vlan1)
+ self.assert_(isinstance(self.network, PhysicalNetwork))
+
+ vlan2 = vlan1+","+self.vlan["partial_range"][1]
+ updatePhysicalNetworkResponse2 = self.network.update(self.apiClient, id = self.networkid, vlan = vlan2)
+ self.assert_(updatePhysicalNetworkResponse2 is not None,
+ msg="couldn't extend the physical network with vlan %s"%vlan2)
+ self.assert_(isinstance(self.network, PhysicalNetwork))
+
+ vlanranges= updatePhysicalNetworkResponse2.vlan
+ self.assert_(vlanranges is not None,
+ "No VLAN ranges found on the deployment")
+ self.assert_(str(vlanranges) == vlan2, "vlan ranges are not extended")
+
+
+ def tearDown(self):
+ """
+ Teardown to update a physical network and shrink its vlan
+ @return:
+ """
+ phy_networks = PhysicalNetwork.list(self.apiClient)
+ self.assertNotEqual(len(phy_networks), 0,
+ msg="There are no physical networks in the zone")
+ self.network = phy_networks[0]
+ self.networkid = phy_networks[0].id
+ updateResponse = self.network.update(self.apiClient, id = self.networkid, vlan=self.existing_vlan)
+ self.assert_(updateResponse.vlan.find(self.vlan["full_range"]) < 0,
+ "VLAN was not removed successfully")
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eedbe4fe/test/integration/smokeseq/test_portable_publicip.py
----------------------------------------------------------------------
diff --git a/test/integration/smokeseq/test_portable_publicip.py b/test/integration/smokeseq/test_portable_publicip.py
new file mode 100644
index 0000000..eef0283
--- /dev/null
+++ b/test/integration/smokeseq/test_portable_publicip.py
@@ -0,0 +1,179 @@
+#!/usr/bin/env python
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
+import pytest
+
+class TestPortablePublicIPRange(cloudstackTestCase):
+
+ """
+ This test validates functionality where
+ - admin can provision a portable public ip range
+ - list provisioned portable public ip range
+ - delete provisioned portable public ip range
+ """
+ @classmethod
+ def setUpClass(cls):
+ testClient = super(TestPortablePublicIPRange, cls).getClsTestClient()
+ cls.apiclient = testClient.getApiClient()
+ cls.services = testClient.getParsedTestDataConfig()
+
+ # Get Zone, Domain
+ cls.domain = get_domain(cls.apiclient)
+ cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+
+ # Create Account
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.services["account"],
+ domainid=cls.domain.id
+ )
+ cls._cleanup = [
+ cls.account,
+ ]
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ # Cleanup resources used
+ cleanup_resources(cls.apiclient, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ # Clean up
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ @pytest.mark.tags(tags = ["basic", "advanced", "portablepublicip"], required_hardware="false")
+ def test_createPortablePublicIPRange(self):
+ """ Test to create a portable public ip range
+ """
+ self.debug("attempting to create a portable Public IP range")
+ self.portable_ip_range = PortablePublicIpRange.create(
+ self.apiclient,
+ self.services
+ )
+ self.debug("attempting to verify portable Public IP range is created")
+ list_portbale_ip_range_response = PortablePublicIpRange.list(
+ self.apiclient,
+ id=self.portable_ip_range.id
+ )
+ self.portable_ip_range.delete(self.apiclient)
+ return
+
+
+class TestPortablePublicIPAcquire(cloudstackTestCase):
+ """
+ This test validates functionality where
+ - admin has provisioned a portable public ip range
+ - user can acquire portable ip from the provisioned ip range
+ """
+ @classmethod
+ def setUpClass(cls):
+ testClient = super(TestPortablePublicIPAcquire, cls).getClsTestClient()
+ cls.apiclient = testClient.getApiClient()
+ cls.services = testClient.getParsedTestDataConfig()
+
+ # Get Zone, Domain
+ cls.domain = get_domain(cls.apiclient)
+ cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
+ # Create Account
+ cls.account = Account.create(
+ cls.apiclient,
+ cls.services["account"],
+ domainid=cls.domain.id
+ )
+ cls.services["network"]["zoneid"] = cls.zone.id
+
+ cls.network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["network_offering"],
+ )
+ # Enable Network offering
+ cls.network_offering.update(cls.apiclient, state='Enabled')
+
+ cls.services["network"]["networkoffering"] = cls.network_offering.id
+ cls.account_network = Network.create(
+ cls.apiclient,
+ cls.services["network"],
+ cls.account.name,
+ cls.account.domainid
+ )
+ cls._cleanup = [
+ cls.account_network,
+ cls.network_offering,
+ cls.account
+ ]
+
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ # Cleanup resources used
+ cleanup_resources(cls.apiclient, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ # Clean up
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ @pytest.mark.tags(tags = ["advanced", "portablepublicip"], required_hardware="false")
+ def test_createPortablePublicIPAcquire(self):
+ """ Test to acquire a provisioned public ip range
+ """
+ self.debug("attempting to create a portable Public IP range")
+ self.portable_ip_range = PortablePublicIpRange.create(
+ self.apiclient,
+ self.services
+ )
+
+ ip_address = PublicIPAddress.create(self.apiclient, self.account.name,
+ self.zone.id, self.account.domainid, isportable=True)
+
+ ip_address.delete(self.apiclient)
+ self.portable_ip_range.delete(self.apiclient)
+ return
[2/2] git commit: updated refs/heads/pytest to eedbe4f
Posted by ed...@apache.org.
move certain tests which can not run in parallel
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eedbe4fe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eedbe4fe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eedbe4fe
Branch: refs/heads/pytest
Commit: eedbe4fee898ca8a2e2b9d30e2880872d7118d73
Parents: 7c19ad3
Author: Edison Su <su...@gmail.com>
Authored: Thu Sep 18 14:13:24 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Sep 18 14:13:24 2014 -0700
----------------------------------------------------------------------
test/integration/smoke/test_network.py | 974 -------------------
.../smoke/test_non_contigiousvlan.py | 84 --
.../integration/smoke/test_portable_publicip.py | 179 ----
test/integration/smoke/test_vm_life_cycle.py | 36 +-
test/integration/smokeseq/test_network.py | 974 +++++++++++++++++++
.../smokeseq/test_non_contigiousvlan.py | 84 ++
.../smokeseq/test_portable_publicip.py | 179 ++++
7 files changed, 1251 insertions(+), 1259 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eedbe4fe/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
deleted file mode 100644
index 26d887e..0000000
--- a/test/integration/smoke/test_network.py
+++ /dev/null
@@ -1,974 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-""" BVT tests for Network Life Cycle
-"""
-#Import Local Modules
-import marvin
-from marvin.codes import FAILED
-from marvin.cloudstackException import CloudstackAPIException
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-import pytest
-#Import System modules
-import time
-
-_multiprocess_shared_ = True
-
-
-class TestPublicIP(cloudstackTestCase):
-
- def setUp(self):
- self.apiclient = self.testClient.getApiClient()
-
- @classmethod
- def setUpClass(cls):
- testClient = super(TestPublicIP, cls).getClsTestClient()
- cls.apiclient = testClient.getApiClient()
- cls.services = testClient.getParsedTestDataConfig()
-
- # Get Zone, Domain and templates
- cls.domain = get_domain(cls.apiclient)
- cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
- cls.services['mode'] = cls.zone.networktype
- # Create Accounts & networks
- cls.account = Account.create(
- cls.apiclient,
- cls.services["account"],
- admin=True,
- domainid=cls.domain.id
- )
-
- cls.user = Account.create(
- cls.apiclient,
- cls.services["account"],
- domainid=cls.domain.id
- )
- cls.services["network"]["zoneid"] = cls.zone.id
-
- cls.network_offering = NetworkOffering.create(
- cls.apiclient,
- cls.services["network_offering"],
- )
- # Enable Network offering
- cls.network_offering.update(cls.apiclient, state='Enabled')
-
- cls.services["network"]["networkoffering"] = cls.network_offering.id
- cls.account_network = Network.create(
- cls.apiclient,
- cls.services["network"],
- cls.account.name,
- cls.account.domainid
- )
- cls.user_network = Network.create(
- cls.apiclient,
- cls.services["network"],
- cls.user.name,
- cls.user.domainid
- )
-
- # Create Source NAT IP addresses
- account_src_nat_ip = PublicIPAddress.create(
- cls.apiclient,
- cls.account.name,
- cls.zone.id,
- cls.account.domainid
- )
- user_src_nat_ip = PublicIPAddress.create(
- cls.apiclient,
- cls.user.name,
- cls.zone.id,
- cls.user.domainid
- )
- cls._cleanup = [
- cls.account_network,
- cls.user_network,
- cls.account,
- cls.user,
- cls.network_offering
- ]
- return
-
- @classmethod
- def tearDownClass(cls):
- try:
- #Cleanup resources used
- cleanup_resources(cls.apiclient, cls._cleanup)
- except Exception as e:
- raise Exception("Warning: Exception during cleanup : %s" % e)
- return
-
-
- @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="false")
- def test_public_ip_admin_account(self):
- """Test for Associate/Disassociate public IP address for admin account"""
-
- # Validate the following:
- # 1. listPubliIpAddresses API returns the list of acquired addresses
- # 2. the returned list should contain our acquired IP address
-
- ip_address = PublicIPAddress.create(
- self.apiclient,
- self.account.name,
- self.zone.id,
- self.account.domainid
- )
- list_pub_ip_addr_resp = list_publicIP(
- self.apiclient,
- id=ip_address.ipaddress.id
- )
- self.assertEqual(
- isinstance(list_pub_ip_addr_resp, list),
- True,
- "Check list response returns a valid list"
- )
- #listPublicIpAddresses should return newly created public IP
- self.assertNotEqual(
- len(list_pub_ip_addr_resp),
- 0,
- "Check if new IP Address is associated"
- )
- self.assertEqual(
- list_pub_ip_addr_resp[0].id,
- ip_address.ipaddress.id,
- "Check Correct IP Address is returned in the List Cacls"
- )
-
- ip_address.delete(self.apiclient)
- time.sleep(self.services["sleep"])
-
-
- # Validate the following:
- # 1.listPublicIpAddresses should no more return the released address
- list_pub_ip_addr_resp = list_publicIP(
- self.apiclient,
- id=ip_address.ipaddress.id
- )
- if list_pub_ip_addr_resp is None:
- return
- if (list_pub_ip_addr_resp) and (isinstance(list_pub_ip_addr_resp, list)) and (len(list_pub_ip_addr_resp) > 0):
- self.fail("list public ip response is not empty")
- return
-
- @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="false")
- def test_public_ip_user_account(self):
- """Test for Associate/Disassociate public IP address for user account"""
-
- # Validate the following:
- # 1. listPubliIpAddresses API returns the list of acquired addresses
- # 2. the returned list should contain our acquired IP address
-
- ip_address = PublicIPAddress.create(
- self.apiclient,
- self.user.name,
- self.zone.id,
- self.user.domainid
- )
-
- #listPublicIpAddresses should return newly created public IP
- list_pub_ip_addr_resp = list_publicIP(
- self.apiclient,
- id=ip_address.ipaddress.id
- )
- self.assertEqual(
- isinstance(list_pub_ip_addr_resp, list),
- True,
- "Check list response returns a valid list"
- )
- self.assertNotEqual(
- len(list_pub_ip_addr_resp),
- 0,
- "Check if new IP Address is associated"
- )
- self.assertEqual(
- list_pub_ip_addr_resp[0].id,
- ip_address.ipaddress.id,
- "Check Correct IP Address is returned in the List Call"
- )
-
- ip_address.delete(self.apiclient)
-
- list_pub_ip_addr_resp = list_publicIP(
- self.apiclient,
- id=ip_address.ipaddress.id
- )
-
- self.assertEqual(
- list_pub_ip_addr_resp,
- None,
- "Check if disassociated IP Address is no longer available"
- )
- return
-
-
-class TestPortForwarding(cloudstackTestCase):
-
- @classmethod
- def setUpClass(cls):
-
- testClient = super(TestPortForwarding, cls).getClsTestClient()
- cls.apiclient = testClient.getApiClient()
- cls.services = testClient.getParsedTestDataConfig()
- # Get Zone, Domain and templates
- cls.domain = get_domain(cls.apiclient)
- cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
- template = get_template(
- cls.apiclient,
- cls.zone.id,
- cls.services["ostype"]
- )
- if template == FAILED:
- assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
-
- #Create an account, network, VM and IP addresses
- cls.account = Account.create(
- cls.apiclient,
- cls.services["account"],
- admin=True,
- domainid=cls.domain.id
- )
- cls.services["virtual_machine"]["zoneid"] = cls.zone.id
- cls.service_offering = ServiceOffering.create(
- cls.apiclient,
- cls.services["service_offerings"]
- )
- cls.virtual_machine = VirtualMachine.create(
- cls.apiclient,
- cls.services["virtual_machine"],
- templateid=template.id,
- accountid=cls.account.name,
- domainid=cls.account.domainid,
- serviceofferingid=cls.service_offering.id
- )
- cls._cleanup = [
- cls.virtual_machine,
- cls.account,
- cls.service_offering
- ]
-
- def setUp(self):
- self.apiclient = self.testClient.getApiClient()
- self.cleanup = []
- return
-
- @classmethod
- def tearDownClass(cls):
- try:
- cls.apiclient = super(TestPortForwarding, cls).getClsTestClient().getApiClient()
- cleanup_resources(cls.apiclient, cls._cleanup)
- except Exception as e:
- raise Exception("Warning: Exception during cleanup : %s" % e)
-
- def tearDown(self):
- cleanup_resources(self.apiclient, self.cleanup)
- return
-
- @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="true")
- def test_01_port_fwd_on_src_nat(self):
- """Test for port forwarding on source NAT"""
-
- #Validate the following:
- #1. listPortForwarding rules API should return the added PF rule
- #2. attempt to do an ssh into the user VM through the sourceNAT
-
- src_nat_ip_addrs = list_publicIP(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
-
- self.assertEqual(
- isinstance(src_nat_ip_addrs, list),
- True,
- "Check list response returns a valid list"
- )
- src_nat_ip_addr = src_nat_ip_addrs[0]
-
- # Check if VM is in Running state before creating NAT rule
- vm_response = VirtualMachine.list(
- self.apiclient,
- id=self.virtual_machine.id
- )
-
- self.assertEqual(
- isinstance(vm_response, list),
- True,
- "Check list VM returns a valid list"
- )
-
- self.assertNotEqual(
- len(vm_response),
- 0,
- "Check Port Forwarding Rule is created"
- )
- self.assertEqual(
- vm_response[0].state,
- 'Running',
- "VM state should be Running before creating a NAT rule."
- )
- # Open up firewall port for SSH
- fw_rule = FireWallRule.create(
- self.apiclient,
- ipaddressid=src_nat_ip_addr.id,
- protocol=self.services["natrule"]["protocol"],
- cidrlist=['0.0.0.0/0'],
- startport=self.services["natrule"]["publicport"],
- endport=self.services["natrule"]["publicport"]
- )
-
- #Create NAT rule
- nat_rule = NATRule.create(
- self.apiclient,
- self.virtual_machine,
- self.services["natrule"],
- src_nat_ip_addr.id
- )
-
- list_nat_rule_response = list_nat_rules(
- self.apiclient,
- id=nat_rule.id
- )
- self.assertEqual(
- isinstance(list_nat_rule_response, list),
- True,
- "Check list response returns a valid list"
- )
-
- self.assertNotEqual(
- len(list_nat_rule_response),
- 0,
- "Check Port Forwarding Rule is created"
- )
- self.assertEqual(
- list_nat_rule_response[0].id,
- nat_rule.id,
- "Check Correct Port forwarding Rule is returned"
- )
- #SSH virtual machine to test port forwarding
- try:
- self.debug("SSHing into VM with IP address %s with NAT IP %s" %
- (
- self.virtual_machine.ipaddress,
- src_nat_ip_addr.ipaddress
- ))
-
- self.virtual_machine.get_ssh_client(src_nat_ip_addr.ipaddress)
- vm_response = VirtualMachine.list(
- self.apiclient,
- id=self.virtual_machine.id
- )
- if vm_response[0].state != 'Running':
- self.fail("State of VM : %s is not found to be Running" % str(self.virtual_machine.ipaddress))
-
- except Exception as e:
- self.fail(
- "SSH Access failed for %s: %s" % \
- (self.virtual_machine.ipaddress, e)
- )
-
- try:
- nat_rule.delete(self.apiclient)
- except Exception as e:
- self.fail("NAT Rule Deletion Failed: %s" % e)
-
- # NAT rule listing should fail as the nat rule does not exist
- with self.assertRaises(Exception):
- list_nat_rules(self.apiclient,
- id=nat_rule.id)
-
- # Check if the Public SSH port is inaccessible
- with self.assertRaises(Exception):
- self.debug(
- "SSHing into VM with IP address %s after NAT rule deletion" %
- self.virtual_machine.ipaddress)
-
- SshClient(
- src_nat_ip_addr.ipaddress,
- self.virtual_machine.ssh_port,
- self.virtual_machine.username,
- self.virtual_machine.password
- )
- return
-
- @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="true")
- def test_02_port_fwd_on_non_src_nat(self):
- """Test for port forwarding on non source NAT"""
-
- #Validate the following:
- #1. listPortForwardingRules should not return the deleted rule anymore
- #2. attempt to do ssh should now fail
-
- ip_address = PublicIPAddress.create(
- self.apiclient,
- self.account.name,
- self.zone.id,
- self.account.domainid,
- self.services["virtual_machine"]
- )
- self.cleanup.append(ip_address)
-
- # Check if VM is in Running state before creating NAT rule
- vm_response = VirtualMachine.list(
- self.apiclient,
- id=self.virtual_machine.id
- )
-
- self.assertEqual(
- isinstance(vm_response, list),
- True,
- "Check list VM returns a valid list"
- )
-
- self.assertNotEqual(
- len(vm_response),
- 0,
- "Check Port Forwarding Rule is created"
- )
- self.assertEqual(
- vm_response[0].state,
- 'Running',
- "VM state should be Running before creating a NAT rule."
- )
- # Open up firewall port for SSH
- fw_rule = FireWallRule.create(
- self.apiclient,
- ipaddressid=ip_address.ipaddress.id,
- protocol=self.services["natrule"]["protocol"],
- cidrlist=['0.0.0.0/0'],
- startport=self.services["natrule"]["publicport"],
- endport=self.services["natrule"]["publicport"]
- )
- #Create NAT rule
- nat_rule = NATRule.create(
- self.apiclient,
- self.virtual_machine,
- self.services["natrule"],
- ip_address.ipaddress.id
- )
- #Validate the following:
- #1. listPortForwardingRules should not return the deleted rule anymore
- #2. attempt to do ssh should now fail
-
- list_nat_rule_response = list_nat_rules(
- self.apiclient,
- id=nat_rule.id
- )
- self.assertEqual(
- isinstance(list_nat_rule_response, list),
- True,
- "Check list response returns a valid list"
- )
- self.assertNotEqual(
- len(list_nat_rule_response),
- 0,
- "Check Port Forwarding Rule is created"
- )
- self.assertEqual(
- list_nat_rule_response[0].id,
- nat_rule.id,
- "Check Correct Port forwarding Rule is returned"
- )
-
- try:
- self.debug("SSHing into VM with IP address %s with NAT IP %s" %
- (
- self.virtual_machine.ipaddress,
- ip_address.ipaddress.ipaddress
- ))
- self.virtual_machine.get_ssh_client(ip_address.ipaddress.ipaddress)
- except Exception as e:
- self.fail(
- "SSH Access failed for %s: %s" % \
- (self.virtual_machine.ipaddress, e)
- )
-
- nat_rule.delete(self.apiclient)
-
- try:
- list_nat_rule_response = list_nat_rules(
- self.apiclient,
- id=nat_rule.id
- )
- except CloudstackAPIException:
- self.debug("Nat Rule is deleted")
-
- # Check if the Public SSH port is inaccessible
- with self.assertRaises(Exception):
- self.debug(
- "SSHing into VM with IP address %s after NAT rule deletion" %
- self.virtual_machine.ipaddress)
-
- SshClient(
- ip_address.ipaddress.ipaddress,
- self.virtual_machine.ssh_port,
- self.virtual_machine.username,
- self.virtual_machine.password,
- retries=2,
- delay=0
- )
- return
-
-
-
-
-class TestRebootRouter(cloudstackTestCase):
-
- def setUp(self):
-
- self.apiclient = self.testClient.getApiClient()
- self.services = self.testClient.getParsedTestDataConfig()
-
- # Get Zone, Domain and templates
- self.domain = get_domain(self.apiclient)
- self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
- template = get_template(
- self.apiclient,
- self.zone.id,
- self.services["ostype"]
- )
- if template == FAILED:
- self.fail("get_template() failed to return template with description %s" % self.services["ostype"])
- self.services["virtual_machine"]["zoneid"] = self.zone.id
-
- #Create an account, network, VM and IP addresses
- self.account = Account.create(
- self.apiclient,
- self.services["account"],
- admin=True,
- domainid=self.domain.id
- )
- self.service_offering = ServiceOffering.create(
- self.apiclient,
- self.services["service_offerings"]
- )
- self.vm_1 = VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- templateid=template.id,
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id
- )
-
- # Wait for VM to come up
- time.sleep(self.services["sleep"])
-
-
- src_nat_ip_addrs = list_publicIP(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
- try:
- src_nat_ip_addr = src_nat_ip_addrs[0]
- except Exception as e:
- raise Exception("Warning: Exception during fetching source NAT: %s" % e)
-
- self.public_ip = PublicIPAddress.create(
- self.apiclient,
- self.vm_1.account,
- self.vm_1.zoneid,
- self.vm_1.domainid,
- self.services["virtual_machine"]
- )
- #Open up firewall port for SSH
- fw_rule = FireWallRule.create(
- self.apiclient,
- ipaddressid=self.public_ip.ipaddress.id,
- protocol=self.services["lbrule"]["protocol"],
- cidrlist=['0.0.0.0/0'],
- startport=self.services["lbrule"]["publicport"],
- endport=self.services["lbrule"]["publicport"]
- )
-
- lb_rule = LoadBalancerRule.create(
- self.apiclient,
- self.services["lbrule"],
- src_nat_ip_addr.id,
- self.account.name
- )
- lb_rule.assign(self.apiclient, [self.vm_1])
- self.nat_rule = NATRule.create(
- self.apiclient,
- self.vm_1,
- self.services["natrule"],
- ipaddressid=self.public_ip.ipaddress.id
- )
- self.cleanup = [self.nat_rule,
- lb_rule,
- self.vm_1,
- self.service_offering,
- self.account,
- ]
- return
-
- @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="true")
- def test_reboot_router(self):
- """Test for reboot router"""
-
- #Validate the Following
- #1. Post restart PF and LB rules should still function
- #2. verify if the ssh into the virtual machine
- # still works through the sourceNAT Ip
-
- #Retrieve router for the user account
-
- self.debug("Public IP: %s" % self.vm_1.ssh_ip)
- self.debug("Public IP: %s" % self.public_ip.ipaddress.ipaddress)
- routers = list_routers(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
- self.assertEqual(
- isinstance(routers, list),
- True,
- "Check list routers returns a valid list"
- )
-
- router = routers[0]
-
- self.debug("Rebooting the router (ID: %s)" % router.id)
-
- cmd = rebootRouter.rebootRouterCmd()
- cmd.id = router.id
- self.apiclient.rebootRouter(cmd)
-
- # Poll listVM to ensure VM is stopped properly
- timeout = self.services["timeout"]
-
- while True:
- time.sleep(self.services["sleep"])
-
- # Ensure that VM is in stopped state
- list_vm_response = list_virtual_machines(
- self.apiclient,
- id=self.vm_1.id
- )
-
- if isinstance(list_vm_response, list):
-
- vm = list_vm_response[0]
- if vm.state == 'Running':
- self.debug("VM state: %s" % vm.state)
- break
-
- if timeout == 0:
- raise Exception(
- "Failed to start VM (ID: %s) in change service offering" % vm.id)
-
- timeout = timeout - 1
-
- #we should be able to SSH after successful reboot
- try:
- self.debug("SSH into VM (ID : %s ) after reboot" % self.vm_1.id)
-
- SshClient(
- self.public_ip.ipaddress.ipaddress,
- self.services["natrule"]["publicport"],
- self.vm_1.username,
- self.vm_1.password
- )
- except Exception as e:
- self.fail(
- "SSH Access failed for %s: %s" % \
- (self.public_ip.ipaddress.ipaddress, e))
- return
-
- def tearDown(self):
- cleanup_resources(self.apiclient, self.cleanup)
- return
-
-
-class TestReleaseIP(cloudstackTestCase):
-
- def setUp(self):
- self.apiclient = self.testClient.getApiClient()
- self.services = self.testClient.getParsedTestDataConfig()
-
- # Get Zone, Domain and templates
- self.domain = get_domain(self.apiclient)
- self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
- template = get_template(
- self.apiclient,
- self.zone.id,
- self.services["ostype"]
- )
- self.services["virtual_machine"]["zoneid"] = self.zone.id
-
- #Create an account, network, VM, Port forwarding rule, LB rules
- self.account = Account.create(
- self.apiclient,
- self.services["account"],
- admin=True,
- domainid=self.domain.id
- )
-
- self.service_offering = ServiceOffering.create(
- self.apiclient,
- self.services["service_offerings"]
- )
-
- self.virtual_machine = VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- templateid=template.id,
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id
- )
-
- self.ip_address = PublicIPAddress.create(
- self.apiclient,
- self.account.name,
- self.zone.id,
- self.account.domainid
- )
-
- ip_addrs = list_publicIP(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid,
- issourcenat=False
- )
- try:
- self.ip_addr = ip_addrs[0]
- except Exception as e:
- raise Exception("Failed: During acquiring source NAT for account: %s" %
- self.account.name)
-
- self.nat_rule = NATRule.create(
- self.apiclient,
- self.virtual_machine,
- self.services["natrule"],
- self.ip_addr.id
- )
- self.lb_rule = LoadBalancerRule.create(
- self.apiclient,
- self.services["lbrule"],
- self.ip_addr.id,
- accountid=self.account.name
- )
- self.cleanup = [
- self.virtual_machine,
- self.account
- ]
- return
-
- def tearDown(self):
- cleanup_resources(self.apiclient, self.cleanup)
-
- @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="false")
- def test_releaseIP(self):
- """Test for release public IP address"""
-
- self.debug("Deleting Public IP : %s" % self.ip_addr.id)
-
- self.ip_address.delete(self.apiclient)
-
- retriesCount = 10
- isIpAddressDisassociated = False
- while retriesCount > 0:
- listResponse = list_publicIP(
- self.apiclient,
- id=self.ip_addr.id
- )
- if listResponse is None:
- isIpAddressDisassociated = True
- break
- retriesCount -= 1
- time.sleep(self.services["sleep"])
-
- # End while
-
- self.assertTrue(isIpAddressDisassociated, "Failed to disassociate IP address")
-
- # ListPortForwardingRules should not list
- # associated rules with Public IP address
- try:
- list_nat_rule = list_nat_rules(
- self.apiclient,
- id=self.nat_rule.id
- )
- self.debug("List NAT Rule response" + str(list_nat_rule))
- except CloudstackAPIException:
- self.debug("Port Forwarding Rule is deleted")
-
- # listLoadBalancerRules should not list
- # associated rules with Public IP address
- try:
- list_lb_rule = list_lb_rules(
- self.apiclient,
- id=self.lb_rule.id
- )
- self.debug("List LB Rule response" + str(list_lb_rule))
- except CloudstackAPIException:
- self.debug("Port Forwarding Rule is deleted")
-
- # SSH Attempt though public IP should fail
- with self.assertRaises(Exception):
- ssh_2 = SshClient(
- self.ip_addr.ipaddress,
- self.services["natrule"]["publicport"],
- self.virtual_machine.username,
- self.virtual_machine.password,
- retries=2,
- delay=0
- )
- return
-
-
-class TestDeleteAccount(cloudstackTestCase):
-
- def setUp(self):
-
- self.apiclient = self.testClient.getApiClient()
- self.services = self.testClient.getParsedTestDataConfig()
-
- # Get Zone, Domain and templates
- self.domain = get_domain(self.apiclient)
- self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
- template = get_template(
- self.apiclient,
- self.zone.id,
- self.services["ostype"]
- )
- self.services["virtual_machine"]["zoneid"] = self.zone.id
-
- #Create an account, network, VM and IP addresses
- self.account = Account.create(
- self.apiclient,
- self.services["account"],
- admin=True,
- domainid=self.domain.id
- )
- self.service_offering = ServiceOffering.create(
- self.apiclient,
- self.services["service_offerings"]
- )
- self.vm_1 = VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- templateid=template.id,
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id
- )
-
- src_nat_ip_addrs = list_publicIP(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
-
- try:
- src_nat_ip_addr = src_nat_ip_addrs[0]
- except Exception as e:
- self.fail("SSH failed for VM with IP: %s" %
- src_nat_ip_addr.ipaddress)
-
- self.lb_rule = LoadBalancerRule.create(
- self.apiclient,
- self.services["lbrule"],
- src_nat_ip_addr.id,
- self.account.name
- )
- self.lb_rule.assign(self.apiclient, [self.vm_1])
-
- self.nat_rule = NATRule.create(
- self.apiclient,
- self.vm_1,
- self.services["natrule"],
- src_nat_ip_addr.id
- )
- self.cleanup = []
- return
-
- @pytest.mark.tags(tags = ["advanced", "advancedns", "smoke"], required_hardware="false")
- def test_delete_account(self):
- """Test for delete account"""
-
- #Validate the Following
- # 1. after account.cleanup.interval (global setting)
- # time all the PF/LB rules should be deleted
- # 2. verify that list(LoadBalancer/PortForwarding)Rules
- # API does not return any rules for the account
- # 3. The domR should have been expunged for this account
-
- self.account.delete(self.apiclient)
- interval = list_configurations(
- self.apiclient,
- name='account.cleanup.interval'
- )
- self.assertEqual(
- isinstance(interval, list),
- True,
- "Check if account.cleanup.interval config present"
- )
- # Sleep to ensure that all resources are deleted
- time.sleep(int(interval[0].value))
-
- # ListLoadBalancerRules should not list
- # associated rules with deleted account
- # Unable to find account testuser1 in domain 1 : Exception
- try:
- list_lb_reponse = list_lb_rules(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
- except CloudstackAPIException:
- self.debug("Port Forwarding Rule is deleted")
-
- # ListPortForwardingRules should not
- # list associated rules with deleted account
- try:
- list_nat_reponse = list_nat_rules(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
- except CloudstackAPIException:
- self.debug("NATRule is deleted")
-
- #Retrieve router for the user account
- try:
- routers = list_routers(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
- self.assertEqual(
- routers,
- None,
- "Check routers are properly deleted."
- )
- except CloudstackAPIException:
- self.debug("Router is deleted")
-
- except Exception as e:
- raise Exception(
- "Encountered %s raised while fetching routers for account: %s" % (e,
- self.account.name))
- return
-
- def tearDown(self):
- cleanup_resources(self.apiclient, self.cleanup)
- return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eedbe4fe/test/integration/smoke/test_non_contigiousvlan.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_non_contigiousvlan.py b/test/integration/smoke/test_non_contigiousvlan.py
deleted file mode 100644
index bc7cd16..0000000
--- a/test/integration/smoke/test_non_contigiousvlan.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#from marvin.cloudstackAPI import *
-from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.lib.base import PhysicalNetwork
-from marvin.lib.common import setNonContiguousVlanIds, get_zone
-import pytest
-
-
-class TestUpdatePhysicalNetwork(cloudstackTestCase):
- """
- Test to extend physical network vlan range
- """
- def setUp(self):
- self.apiClient = self.testClient.getApiClient()
- self.zone = get_zone(self.apiClient, self.testClient.getZoneForTests())
- self.physicalnetwork, self.vlan = setNonContiguousVlanIds(self.apiClient, self.zone.id)
-
- self.physicalnetworkid = self.physicalnetwork.id
- self.existing_vlan = self.physicalnetwork.vlan
-
- if self.vlan is None:
- raise Exception("Failed to set non contiguous vlan ids to test. Free some ids from \
- from existing physical networks at ends")
-
- @pytest.mark.tags(tags = ["advanced"], required_hardware="false")
- def test_extendPhysicalNetworkVlan(self):
- """
- Test to update a physical network and extend its vlan
- """
- phy_networks = PhysicalNetwork.list(self.apiClient)
- self.assertNotEqual(len(phy_networks), 0,
- msg="There are no physical networks in the zone")
-
- self.network = phy_networks[0]
- self.networkid = phy_networks[0].id
- self.existing_vlan = phy_networks[0].vlan
- vlan1 = self.existing_vlan+","+self.vlan["partial_range"][0]
- updatePhysicalNetworkResponse = self.network.update(self.apiClient, id = self.networkid, vlan = vlan1)
- self.assert_(updatePhysicalNetworkResponse is not None,
- msg="couldn't extend the physical network with vlan %s"%vlan1)
- self.assert_(isinstance(self.network, PhysicalNetwork))
-
- vlan2 = vlan1+","+self.vlan["partial_range"][1]
- updatePhysicalNetworkResponse2 = self.network.update(self.apiClient, id = self.networkid, vlan = vlan2)
- self.assert_(updatePhysicalNetworkResponse2 is not None,
- msg="couldn't extend the physical network with vlan %s"%vlan2)
- self.assert_(isinstance(self.network, PhysicalNetwork))
-
- vlanranges= updatePhysicalNetworkResponse2.vlan
- self.assert_(vlanranges is not None,
- "No VLAN ranges found on the deployment")
- self.assert_(str(vlanranges) == vlan2, "vlan ranges are not extended")
-
-
- def tearDown(self):
- """
- Teardown to update a physical network and shrink its vlan
- @return:
- """
- phy_networks = PhysicalNetwork.list(self.apiClient)
- self.assertNotEqual(len(phy_networks), 0,
- msg="There are no physical networks in the zone")
- self.network = phy_networks[0]
- self.networkid = phy_networks[0].id
- updateResponse = self.network.update(self.apiClient, id = self.networkid, vlan=self.existing_vlan)
- self.assert_(updateResponse.vlan.find(self.vlan["full_range"]) < 0,
- "VLAN was not removed successfully")
-
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eedbe4fe/test/integration/smoke/test_portable_publicip.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_portable_publicip.py b/test/integration/smoke/test_portable_publicip.py
deleted file mode 100644
index eef0283..0000000
--- a/test/integration/smoke/test_portable_publicip.py
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/env python
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-import pytest
-
-class TestPortablePublicIPRange(cloudstackTestCase):
-
- """
- This test validates functionality where
- - admin can provision a portable public ip range
- - list provisioned portable public ip range
- - delete provisioned portable public ip range
- """
- @classmethod
- def setUpClass(cls):
- testClient = super(TestPortablePublicIPRange, cls).getClsTestClient()
- cls.apiclient = testClient.getApiClient()
- cls.services = testClient.getParsedTestDataConfig()
-
- # Get Zone, Domain
- cls.domain = get_domain(cls.apiclient)
- cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
-
- # Create Account
- cls.account = Account.create(
- cls.apiclient,
- cls.services["account"],
- domainid=cls.domain.id
- )
- cls._cleanup = [
- cls.account,
- ]
- return
-
- @classmethod
- def tearDownClass(cls):
- try:
- # Cleanup resources used
- cleanup_resources(cls.apiclient, cls._cleanup)
- except Exception as e:
- raise Exception("Warning: Exception during cleanup : %s" % e)
- return
-
- def setUp(self):
- self.apiclient = self.testClient.getApiClient()
- self.dbclient = self.testClient.getDbConnection()
- self.cleanup = []
- return
-
- def tearDown(self):
- try:
- # Clean up
- cleanup_resources(self.apiclient, self.cleanup)
- except Exception as e:
- raise Exception("Warning: Exception during cleanup : %s" % e)
- return
-
- @pytest.mark.tags(tags = ["basic", "advanced", "portablepublicip"], required_hardware="false")
- def test_createPortablePublicIPRange(self):
- """ Test to create a portable public ip range
- """
- self.debug("attempting to create a portable Public IP range")
- self.portable_ip_range = PortablePublicIpRange.create(
- self.apiclient,
- self.services
- )
- self.debug("attempting to verify portable Public IP range is created")
- list_portbale_ip_range_response = PortablePublicIpRange.list(
- self.apiclient,
- id=self.portable_ip_range.id
- )
- self.portable_ip_range.delete(self.apiclient)
- return
-
-
-class TestPortablePublicIPAcquire(cloudstackTestCase):
- """
- This test validates functionality where
- - admin has provisioned a portable public ip range
- - user can acquire portable ip from the provisioned ip range
- """
- @classmethod
- def setUpClass(cls):
- testClient = super(TestPortablePublicIPAcquire, cls).getClsTestClient()
- cls.apiclient = testClient.getApiClient()
- cls.services = testClient.getParsedTestDataConfig()
-
- # Get Zone, Domain
- cls.domain = get_domain(cls.apiclient)
- cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
- # Create Account
- cls.account = Account.create(
- cls.apiclient,
- cls.services["account"],
- domainid=cls.domain.id
- )
- cls.services["network"]["zoneid"] = cls.zone.id
-
- cls.network_offering = NetworkOffering.create(
- cls.apiclient,
- cls.services["network_offering"],
- )
- # Enable Network offering
- cls.network_offering.update(cls.apiclient, state='Enabled')
-
- cls.services["network"]["networkoffering"] = cls.network_offering.id
- cls.account_network = Network.create(
- cls.apiclient,
- cls.services["network"],
- cls.account.name,
- cls.account.domainid
- )
- cls._cleanup = [
- cls.account_network,
- cls.network_offering,
- cls.account
- ]
-
- return
-
- @classmethod
- def tearDownClass(cls):
- try:
- # Cleanup resources used
- cleanup_resources(cls.apiclient, cls._cleanup)
- except Exception as e:
- raise Exception("Warning: Exception during cleanup : %s" % e)
- return
-
- def setUp(self):
- self.apiclient = self.testClient.getApiClient()
- self.dbclient = self.testClient.getDbConnection()
- self.cleanup = []
- return
-
- def tearDown(self):
- try:
- # Clean up
- cleanup_resources(self.apiclient, self.cleanup)
- except Exception as e:
- raise Exception("Warning: Exception during cleanup : %s" % e)
- return
-
- @pytest.mark.tags(tags = ["advanced", "portablepublicip"], required_hardware="false")
- def test_createPortablePublicIPAcquire(self):
- """ Test to acquire a provisioned public ip range
- """
- self.debug("attempting to create a portable Public IP range")
- self.portable_ip_range = PortablePublicIpRange.create(
- self.apiclient,
- self.services
- )
-
- ip_address = PublicIPAddress.create(self.apiclient, self.account.name,
- self.zone.id, self.account.domainid, isportable=True)
-
- ip_address.delete(self.apiclient)
- self.portable_ip_range.delete(self.apiclient)
- return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eedbe4fe/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index f0656fe..2962ad4 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -359,17 +359,9 @@ class TestVMLifeCycle(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @pytest.mark.tags(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true", BugId="CLOUDSTACK-6984")
- def test_vm_life_cycle(self):
- self.stop_vm()
- self.start_vm()
- self.reboot_vm()
- self.destroy_vm()
- self.restore_vm()
- self.migrate_vm()
- self.attachAndDetach_iso()
-
- def stop_vm(self):
+
+ @pytest.mark.tags(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+ def test_stop_vm(self):
"""Test Stop Virtual Machine
"""
@@ -382,8 +374,8 @@ class TestVMLifeCycle(cloudstackTestCase):
except Exception as e:
self.fail("Failed to stop VM: %s" % e)
return
-
- def start_vm(self):
+ @pytest.mark.tags(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+ def test_start_vm(self):
"""Test Start Virtual Machine
"""
# Validate the following
@@ -419,7 +411,7 @@ class TestVMLifeCycle(cloudstackTestCase):
"Check virtual machine is in running state"
)
return
-
+ @pytest.mark.tags(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
def reboot_vm(self):
"""Test Reboot Virtual Machine
"""
@@ -455,8 +447,8 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
-
- def destroy_vm(self):
+ @pytest.mark.tags(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+ def test_destroy_vm(self):
"""Test destroy Virtual Machine
"""
@@ -490,8 +482,8 @@ class TestVMLifeCycle(cloudstackTestCase):
"Check virtual machine is in destroyed state"
)
return
-
- def restore_vm(self):
+ @pytest.mark.tags(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+ def test_restore_vm(self):
#TODO: SIMENH: add another test the data on the restored VM.
"""Test recover Virtual Machine
"""
@@ -530,8 +522,8 @@ class TestVMLifeCycle(cloudstackTestCase):
)
return
-
- def migrate_vm(self):
+ @pytest.mark.tags(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+ def test_migrate_vm(self):
"""Test migrate VM
"""
# Validate the following
@@ -652,8 +644,8 @@ class TestVMLifeCycle(cloudstackTestCase):
self.assertEqual(list_vm_response,None,"Check Expunged virtual machine is in listVirtualMachines response")
return
-
- def attachAndDetach_iso(self):
+ @pytest.mark.tags(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="true")
+ def test_attachAndDetach_iso(self):
"""Test for attach and detach ISO to virtual machine"""
# Validate the following