You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/08 20:11:17 UTC
[1/3] git commit: updated refs/heads/4.6 to 3515f57
Repository: cloudstack
Updated Branches:
refs/heads/4.6 6d3fffa22 -> 3515f574c
CLOUDSTACK-9118 - Adds integration test to cover routers state.
- Refactoring the existing tests
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/848ef781
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/848ef781
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/848ef781
Branch: refs/heads/4.6
Commit: 848ef78158b29749ac20f8d4fdf919b07e722af6
Parents: f81a293
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Mon Dec 7 19:26:43 2015 +0100
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Tue Dec 8 11:06:35 2015 +0100
----------------------------------------------------------------------
.../component/test_routers_network_ops.py | 252 +++++++++++++++----
1 file changed, 201 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/848ef781/test/integration/component/test_routers_network_ops.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers_network_ops.py b/test/integration/component/test_routers_network_ops.py
index 1b028f2..94c0774 100644
--- a/test/integration/component/test_routers_network_ops.py
+++ b/test/integration/component/test_routers_network_ops.py
@@ -22,7 +22,8 @@ from marvin.cloudstackAPI import (stopVirtualMachine,
stopRouter,
startRouter)
from marvin.lib.utils import (cleanup_resources,
- get_process_status)
+ get_process_status,
+ get_host_credentials)
from marvin.lib.base import (ServiceOffering,
VirtualMachine,
Account,
@@ -105,22 +106,6 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
cls.services["nw_off_persistent_RVR_egress_false"] = cls.services["nw_off_persistent_RVR"].copy()
cls.services["nw_off_persistent_RVR_egress_false"]["egress_policy"] = "false"
- cls.logger.debug("Creating Network Offering with default egress TRUE")
- cls.network_offering_egress_true = NetworkOffering.create(
- cls.api_client,
- cls.services["nw_off_persistent_RVR_egress_true"],
- conservemode=True
- )
- cls.network_offering_egress_true.update(cls.api_client, state='Enabled')
-
- cls.logger.debug("Creating Network Offering with default egress FALSE")
- cls.network_offering_egress_false = NetworkOffering.create(
- cls.api_client,
- cls.services["nw_off_persistent_RVR_egress_false"],
- conservemode=True
- )
- cls.network_offering_egress_false.update(cls.api_client, state='Enabled')
-
cls.services["egress_80"] = {
"startport": 80,
"endport": 80,
@@ -137,8 +122,6 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
cls._cleanup = [
cls.service_offering,
- cls.network_offering_egress_true,
- cls.network_offering_egress_false,
cls.account
]
@@ -169,13 +152,21 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
""" Test redundant router internals """
self.logger.debug("Starting test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true...")
- self.logger.debug("Creating network with network offering: %s" % self.network_offering_egress_true.id)
+ self.logger.debug("Creating Network Offering with default egress TRUE")
+ network_offering_egress_true = NetworkOffering.create(
+ self.apiclient,
+ self.services["nw_off_persistent_RVR_egress_true"],
+ conservemode=True
+ )
+ network_offering_egress_true.update(self.api_client, state='Enabled')
+
+ self.logger.debug("Creating network with network offering: %s" % network_offering_egress_true.id)
network = Network.create(
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.domainid,
- networkofferingid=self.network_offering_egress_true.id,
+ networkofferingid=network_offering_egress_true.id,
zoneid=self.zone.id
)
self.logger.debug("Created network with ID: %s" % network.id)
@@ -205,6 +196,10 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
self.logger.debug("Deployed VM in network: %s" % network.id)
+ self.cleanup.insert(0, network_offering_egress_true)
+ self.cleanup.insert(0, network)
+ self.cleanup.insert(0, virtual_machine)
+
vms = VirtualMachine.list(
self.apiclient,
id=virtual_machine.id,
@@ -272,9 +267,6 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
public_ip.id
)
- self.cleanup.insert(0, network)
- self.cleanup.insert(0, virtual_machine)
-
# Test SSH after closing port 22
expected = 1
ssh_command = "ping -c 3 8.8.8.8"
@@ -325,13 +317,21 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
""" Test redundant router internals """
self.logger.debug("Starting test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false...")
- self.logger.debug("Creating network with network offering: %s" % self.network_offering_egress_false.id)
+ self.logger.debug("Creating Network Offering with default egress FALSE")
+ network_offering_egress_false = NetworkOffering.create(
+ self.apiclient,
+ self.services["nw_off_persistent_RVR_egress_false"],
+ conservemode=True
+ )
+ network_offering_egress_false.update(self.api_client, state='Enabled')
+
+ self.logger.debug("Creating network with network offering: %s" % network_offering_egress_false.id)
network = Network.create(
self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.domainid,
- networkofferingid=self.network_offering_egress_false.id,
+ networkofferingid=network_offering_egress_false.id,
zoneid=self.zone.id
)
self.logger.debug("Created network with ID: %s" % network.id)
@@ -361,6 +361,10 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
self.logger.debug("Deployed VM in network: %s" % network.id)
+ self.cleanup.insert(0, network_offering_egress_false)
+ self.cleanup.insert(0, network)
+ self.cleanup.insert(0, virtual_machine)
+
vms = VirtualMachine.list(
self.apiclient,
id=virtual_machine.id,
@@ -428,9 +432,6 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
public_ip.id
)
- self.cleanup.insert(0, network)
- self.cleanup.insert(0, virtual_machine)
-
expected = 0
ssh_command = "ping -c 3 8.8.8.8"
check_string = "3 packets received"
@@ -484,6 +485,151 @@ class TestRedundantIsolateNetworks(cloudstackTestCase):
return
+ @attr(tags=["advanced", "advancedns", "ssh"], required_hardware="true")
+ def test_03_RVR_Network_check_router_state(self):
+ """ Test redundant router internals """
+ self.logger.debug("Starting test_03_RVR_Network_check_router_state...")
+
+ hypervisor = self.testClient.getHypervisorInfo()
+
+ self.logger.debug("Creating Network Offering with default egress FALSE")
+ network_offering_egress_false = NetworkOffering.create(
+ self.apiclient,
+ self.services["nw_off_persistent_RVR_egress_false"],
+ conservemode=True
+ )
+ network_offering_egress_false.update(self.apiclient, state='Enabled')
+
+ self.logger.debug("Creating network with network offering: %s" % network_offering_egress_false.id)
+ network = Network.create(
+ self.apiclient,
+ self.services["network"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ networkofferingid=network_offering_egress_false.id,
+ zoneid=self.zone.id
+ )
+ self.logger.debug("Created network with ID: %s" % network.id)
+
+ networks = Network.list(
+ self.apiclient,
+ id=network.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(networks, list),
+ True,
+ "List networks should return a valid response for created network"
+ )
+ nw_response = networks[0]
+
+ self.logger.debug("Deploying VM in account: %s" % self.account.name)
+ virtual_machine = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ templateid=self.template.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ networkids=[str(network.id)]
+ )
+
+ self.logger.debug("Deployed VM in network: %s" % network.id)
+
+ self.cleanup.insert(0, network_offering_egress_false)
+ self.cleanup.insert(0, network)
+ self.cleanup.insert(0, virtual_machine)
+
+ vms = VirtualMachine.list(
+ self.apiclient,
+ id=virtual_machine.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(vms, list),
+ True,
+ "List Vms should return a valid list"
+ )
+ vm = vms[0]
+ self.assertEqual(
+ vm.state,
+ "Running",
+ "VM should be in running state after deployment"
+ )
+
+ self.logger.debug("Listing routers for network: %s" % network.name)
+ routers = Router.list(
+ self.apiclient,
+ networkid=network.id,
+ listall=True
+ )
+ self.assertEqual(
+ isinstance(routers, list),
+ True,
+ "list router should return Master and backup routers"
+ )
+ self.assertEqual(
+ len(routers),
+ 2,
+ "Length of the list router should be 2 (Backup & master)"
+ )
+
+ vals = ["MASTER", "BACKUP", "UNKNOWN"]
+ cnts = [0, 0, 0]
+
+ result = "UNKNOWN"
+ for router in routers:
+ if router.state == "Running":
+ hosts = list_hosts(
+ self.apiclient,
+ zoneid=router.zoneid,
+ type='Routing',
+ state='Up',
+ id=router.hostid
+ )
+ self.assertEqual(
+ isinstance(hosts, list),
+ True,
+ "Check list host returns a valid list"
+ )
+ host = hosts[0]
+
+ if hypervisor.lower() in ('vmware', 'hyperv'):
+ result = str(get_process_status(
+ self.apiclient.connection.mgtSvr,
+ 22,
+ self.apiclient.connection.user,
+ self.apiclient.connection.passwd,
+ router.linklocalip,
+ "sh /opt/cloud/bin/checkrouter.sh ",
+ hypervisor=hypervisor
+ ))
+ else:
+ try:
+ host.user, host.passwd = get_host_credentials(
+ self.config, host.ipaddress)
+ result = str(get_process_status(
+ host.ipaddress,
+ 22,
+ host.user,
+ host.passwd,
+ router.linklocalip,
+ "sh /opt/cloud/bin/checkrouter.sh "
+ ))
+
+ except KeyError:
+ self.skipTest(
+ "Marvin configuration has no host credentials to\
+ check router services")
+
+ if result.count(vals[0]) == 1:
+ cnts[vals.index(vals[0])] += 1
+
+ if cnts[vals.index('MASTER')] != 1:
+ self.fail("No Master or too many master routers found %s" % cnts[vals.index('MASTER')])
+
+ return
+
class TestIsolatedNetworks(cloudstackTestCase):
@@ -528,20 +674,6 @@ class TestIsolatedNetworks(cloudstackTestCase):
cls.services["network_offering_egress_false"] = cls.services["network_offering"].copy()
cls.services["network_offering_egress_false"]["egress_policy"] = "false"
- cls.logger.debug("Creating Network Offering with default egress TRUE")
- cls.network_offering_egress_true = NetworkOffering.create(cls.api_client,
- cls.services["network_offering_egress_true"],
- conservemode=True)
-
- cls.network_offering_egress_true.update(cls.api_client, state='Enabled')
-
- cls.logger.debug("Creating Network Offering with default egress FALSE")
- cls.network_offering_egress_false = NetworkOffering.create(cls.api_client,
- cls.services["network_offering_egress_false"],
- conservemode=True)
-
- cls.network_offering_egress_false.update(cls.api_client, state='Enabled')
-
cls.services["egress_80"] = {
"startport": 80,
"endport": 80,
@@ -550,8 +682,6 @@ class TestIsolatedNetworks(cloudstackTestCase):
}
cls._cleanup = [
- cls.network_offering_egress_true,
- cls.network_offering_egress_false,
cls.service_offering,
cls.account
]
@@ -583,15 +713,22 @@ class TestIsolatedNetworks(cloudstackTestCase):
""" Test redundant router internals """
self.logger.debug("Starting test_01_isolate_network_FW_PF_default_routes_egress_true...")
- self.logger.debug("Creating Network with Network Offering ID %s" % self.network_offering_egress_true.id)
+ self.logger.debug("Creating Network Offering with default egress TRUE")
+ network_offering_egress_true = NetworkOffering.create(self.apiclient,
+ self.services["network_offering_egress_true"],
+ conservemode=True)
+
+ network_offering_egress_true.update(self.apiclient, state='Enabled')
+
+ self.logger.debug("Creating Network with Network Offering ID %s" % network_offering_egress_true.id)
network = Network.create(self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.domainid,
- networkofferingid=self.network_offering_egress_true.id,
+ networkofferingid=network_offering_egress_true.id,
zoneid=self.zone.id)
- self.logger.debug("Creating Virtual Machine on Network %s" % network.id)
+ self.logger.debug("Deploying Virtual Machine on Network %s" % network.id)
virtual_machine = VirtualMachine.create(self.apiclient,
self.services["virtual_machine"],
templateid=self.template.id,
@@ -600,6 +737,9 @@ class TestIsolatedNetworks(cloudstackTestCase):
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)])
+ self.logger.debug("Deployed VM in network: %s" % network.id)
+
+ self.cleanup.insert(0, network_offering_egress_true)
self.cleanup.insert(0, network)
self.cleanup.insert(0, virtual_machine)
@@ -729,15 +869,22 @@ class TestIsolatedNetworks(cloudstackTestCase):
""" Test redundant router internals """
self.logger.debug("Starting test_02_isolate_network_FW_PF_default_routes_egress_false...")
- self.logger.debug("Creating Network with Network Offering ID %s" % self.network_offering_egress_false.id)
+ self.logger.debug("Creating Network Offering with default egress FALSE")
+ network_offering_egress_false = NetworkOffering.create(self.apiclient,
+ self.services["network_offering_egress_false"],
+ conservemode=True)
+
+ network_offering_egress_false.update(self.apiclient, state='Enabled')
+
+ self.logger.debug("Creating Network with Network Offering ID %s" % network_offering_egress_false.id)
network = Network.create(self.apiclient,
self.services["network"],
accountid=self.account.name,
domainid=self.account.domainid,
- networkofferingid=self.network_offering_egress_false.id,
+ networkofferingid=network_offering_egress_false.id,
zoneid=self.zone.id)
- self.logger.debug("Creating Virtual Machine on Network %s" % network.id)
+ self.logger.debug("Deploying Virtual Machine on Network %s" % network.id)
virtual_machine = VirtualMachine.create(self.apiclient,
self.services["virtual_machine"],
templateid=self.template.id,
@@ -746,6 +893,9 @@ class TestIsolatedNetworks(cloudstackTestCase):
serviceofferingid=self.service_offering.id,
networkids=[str(network.id)])
+ self.logger.debug("Deployed VM in network: %s" % network.id)
+
+ self.cleanup.insert(0, network_offering_egress_false)
self.cleanup.insert(0, network)
self.cleanup.insert(0, virtual_machine)
[3/3] git commit: updated refs/heads/4.6 to 3515f57
Posted by re...@apache.org.
Merge pull request #1189 from ekholabs/fix/4.6-rvr_routers_state-CLOUDSTACK-9118
CLOUDSTACK-9118 - As a Developer I want the checkrouter.sh script to report the right information about RVR routers stateThis PR fixes the RVR routers state information retrieved by the Management Server via the ```checkrouter.sh``` script.
In order to cover the changes, a new test has been added to the component/test_routers_network_ops.py test suite: test_03_RVR_Network_check_router_state
* pr/1189:
CLOUDSTACK-9118 - Adds integration test to cover routers state.
CLOUDSTACK-9118 - Improves the existing checkrouter.sh script
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3515f574
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3515f574
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3515f574
Branch: refs/heads/4.6
Commit: 3515f574c39dd8249012cefbce3db7169ffcb59f
Parents: 6d3fffa 848ef78
Author: Remi Bergsma <gi...@remi.nl>
Authored: Tue Dec 8 20:10:15 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Dec 8 20:10:15 2015 +0100
----------------------------------------------------------------------
.../debian/config/opt/cloud/bin/checkrouter.sh | 20 +-
.../opt/cloud/templates/checkrouter.sh.templ | 20 +-
.../component/test_routers_network_ops.py | 252 +++++++++++++++----
3 files changed, 223 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/4.6 to 3515f57
Posted by re...@apache.org.
CLOUDSTACK-9118 - Improves the existing checkrouter.sh script
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f81a2935
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f81a2935
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f81a2935
Branch: refs/heads/4.6
Commit: f81a29351d2c20714db1220c32fee4cdff61ed3b
Parents: 6d3fffa
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Mon Dec 7 19:18:20 2015 +0100
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Tue Dec 8 11:06:35 2015 +0100
----------------------------------------------------------------------
.../debian/config/opt/cloud/bin/checkrouter.sh | 20 +++++++++++---------
.../opt/cloud/templates/checkrouter.sh.templ | 20 +++++++++++---------
2 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f81a2935/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
index f05b440..0ba0ee5 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
@@ -21,15 +21,17 @@ INTERFACE=eth1
ROUTER_TYPE=$(cat /etc/cloudstack/cmdline.json | grep type | awk '{print $2;}' | sed -e 's/[,\"]//g')
if [ $ROUTER_TYPE = "router" ]
then
- INTERFACE=eth2
+ ROUTER_STATE=$(ip addr | grep eth0 | grep inet | wc -l | xargs bash -c 'if [ $0 == 2 ]; then echo "MASTER"; else echo "BACKUP"; fi')
+ STATUS=$ROUTER_STATE
+else
+ ROUTER_STATE=$(ip addr | grep $INTERFACE | grep state | awk '{print $9;}')
+ if [ $ROUTER_STATE = "UP" ]
+ then
+ STATUS=MASTER
+ elif [ $ROUTER_STATE = "DOWN" ]
+ then
+ STATUS=BACKUP
+ fi
fi
-ETH1_STATE=$(ip addr | grep $INTERFACE | grep state | awk '{print $9;}')
-if [ $ETH1_STATE = "UP" ]
-then
- STATUS=MASTER
-elif [ $ETH1_STATE = "DOWN" ]
-then
- STATUS=BACKUP
-fi
echo "Status: ${STATUS}"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f81a2935/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ b/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
index f05b440..0ba0ee5 100755
--- a/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
+++ b/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
@@ -21,15 +21,17 @@ INTERFACE=eth1
ROUTER_TYPE=$(cat /etc/cloudstack/cmdline.json | grep type | awk '{print $2;}' | sed -e 's/[,\"]//g')
if [ $ROUTER_TYPE = "router" ]
then
- INTERFACE=eth2
+ ROUTER_STATE=$(ip addr | grep eth0 | grep inet | wc -l | xargs bash -c 'if [ $0 == 2 ]; then echo "MASTER"; else echo "BACKUP"; fi')
+ STATUS=$ROUTER_STATE
+else
+ ROUTER_STATE=$(ip addr | grep $INTERFACE | grep state | awk '{print $9;}')
+ if [ $ROUTER_STATE = "UP" ]
+ then
+ STATUS=MASTER
+ elif [ $ROUTER_STATE = "DOWN" ]
+ then
+ STATUS=BACKUP
+ fi
fi
-ETH1_STATE=$(ip addr | grep $INTERFACE | grep state | awk '{print $9;}')
-if [ $ETH1_STATE = "UP" ]
-then
- STATUS=MASTER
-elif [ $ETH1_STATE = "DOWN" ]
-then
- STATUS=BACKUP
-fi
echo "Status: ${STATUS}"
\ No newline at end of file