You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/11/24 07:16:08 UTC
[1/2] git commit: updated refs/heads/4.8 to 90ae04b
Repository: cloudstack
Updated Branches:
refs/heads/4.8 ff616e700 -> 90ae04b79
CLOUDSTACK-9598: wrong defaut gateway for the nic in non-default network
when guest VM has nic's in more than one guest network set the tag for
each host in /etc/dhcphosts.txt, and use the tag to add exception in
/etc/dhcpopts.txt to prevent sending default route, dns server in case if the nic is in non-default network
this was the behaviour with edithosts.sh prior to 4.6
added new test case test_router_dhcp_opts to test DHCP option file use of cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ab35e66
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ab35e66
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ab35e66
Branch: refs/heads/4.8
Commit: 7ab35e661607dd93a8d6d7d47dc6807b22129911
Parents: 7f051bd
Author: Murali Reddy <mu...@gmail.com>
Authored: Tue Nov 22 16:30:42 2016 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Tue Nov 22 16:30:42 2016 +0530
----------------------------------------------------------------------
.../debian/config/opt/cloud/bin/cs/CsDhcp.py | 24 +-
test/integration/smoke/test_router_dhcphosts.py | 372 ++++++++++++++++++-
2 files changed, 389 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ab35e66/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
index 3f102e6..180ba12 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
@@ -23,6 +23,7 @@ from cs.CsFile import CsFile
LEASES = "/var/lib/misc/dnsmasq.leases"
DHCP_HOSTS = "/etc/dhcphosts.txt"
+DHCP_OPTS = "/etc/dhcpopts.txt"
CLOUD_CONF = "/etc/dnsmasq.d/cloud.conf"
@@ -35,16 +36,18 @@ class CsDhcp(CsDataBag):
self.devinfo = CsHelper.get_device_info()
self.preseed()
self.cloud = CsFile(DHCP_HOSTS)
+ self.dhcp_opts = CsFile(DHCP_OPTS)
self.conf = CsFile(CLOUD_CONF)
self.cloud.repopulate()
+ self.dhcp_opts.repopulate()
for item in self.dbag:
if item == "id":
continue
self.add(self.dbag[item])
self.write_hosts()
-
+
if self.cloud.is_changed():
self.delete_leases()
@@ -52,6 +55,7 @@ class CsDhcp(CsDataBag):
self.conf.commit()
self.cloud.commit()
+ self.dhcp_opts.commit()
# We restart DNSMASQ every time the configure.py is called in order to avoid lease problems.
if not self.cl.is_redundant() or self.cl.is_master():
@@ -125,9 +129,20 @@ class CsDhcp(CsDataBag):
def add(self, entry):
self.add_host(entry['ipv4_adress'], entry['host_name'])
- self.cloud.add("%s,%s,%s,infinite" % (entry['mac_address'],
- entry['ipv4_adress'],
- entry['host_name']))
+ if entry['default_entry'] == True:
+ self.cloud.add("%s,%s,%s,infinite" % (entry['mac_address'],
+ entry['ipv4_adress'],
+ entry['host_name']))
+ else:
+ tag = entry['ipv4_adress'].replace(".","_")
+ self.cloud.add("%s,set:%s,%s,%s,infinite" % (entry['mac_address'],
+ tag,
+ entry['ipv4_adress'],
+ entry['host_name']))
+ self.dhcp_opts.add("%s,%s" % (tag, 3))
+ self.dhcp_opts.add("%s,%s" % (tag, 6))
+ self.dhcp_opts.add("%s,%s" % (tag, 15))
+
i = IPAddress(entry['ipv4_adress'])
# Calculate the device
for v in self.devinfo:
@@ -136,5 +151,6 @@ class CsDhcp(CsDataBag):
# Virtual Router
v['gateway'] = entry['default_gateway']
+
def add_host(self, ip, hosts):
self.hosts[ip] = hosts
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ab35e66/test/integration/smoke/test_router_dhcphosts.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_router_dhcphosts.py b/test/integration/smoke/test_router_dhcphosts.py
index 4e61954..3a59998 100644
--- a/test/integration/smoke/test_router_dhcphosts.py
+++ b/test/integration/smoke/test_router_dhcphosts.py
@@ -240,7 +240,7 @@ class TestRouterDHCPHosts(cloudstackTestCase):
self.logger.debug("cat /etc/dhcphosts.txt | grep %s | sed 's/\,/ /g' | awk '{print $2}' RESULT IS ==> %s" % (vm.nic[0].ipaddress, result))
res = str(result)
-
+
self.assertEqual(
res.count(vm.nic[0].ipaddress),
1,
@@ -344,7 +344,7 @@ class TestRouterDHCPHosts(cloudstackTestCase):
'Active',
"Check list port forwarding rules"
)
-
+
nat_rules = list_nat_rules(
self.apiclient,
id=nat_rule2.id
@@ -370,7 +370,7 @@ class TestRouterDHCPHosts(cloudstackTestCase):
self.logger.debug("Deleting and Expunging VM %s with ip %s" % (self.vm_1.id, self.vm_1.nic[0].ipaddress))
self.vm_1.delete(self.apiclient)
-
+
self.logger.debug("Creating new VM using the same IP as the one which was deleted => IP 10.1.1.50")
self.vm_1 = VirtualMachine.create(self.apiclient,
self.services["virtual_machine"],
@@ -388,3 +388,369 @@ class TestRouterDHCPHosts(cloudstackTestCase):
self.test_dhcphosts(self.vm_2, router)
return
+
+
+class TestRouterDHCPOpts(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+
+ cls.logger = logging.getLogger('TestRouterDHCPOpts')
+ cls.stream_handler = logging.StreamHandler()
+ cls.logger.setLevel(logging.DEBUG)
+ cls.logger.addHandler(cls.stream_handler)
+
+ cls.testClient = super(TestRouterDHCPOpts, cls).getClsTestClient()
+ cls.api_client = cls.testClient.getApiClient()
+
+ cls.services = cls.testClient.getParsedTestDataConfig()
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+ cls.services['mode'] = cls.zone.networktype
+ cls.template = get_template(
+ cls.api_client,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
+ cls.hostConfig = cls.config.__dict__["zones"][0].__dict__["pods"][0].__dict__["clusters"][0].__dict__["hosts"][0].__dict__
+ cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+
+ cls.logger.debug("Creating Admin Account for domain %s on zone %s" % (cls.domain.id, cls.zone.id))
+ # Create an account, network, VM and IP addresses
+ cls.account = Account.create(
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
+
+ cls.logger.debug("Creating Service Offering on zone %s" % (cls.zone.id))
+ cls.service_offering = ServiceOffering.create(
+ cls.api_client,
+ cls.services["service_offering"]
+ )
+
+ cls.services["isolated_network_offering"]["egress_policy"] = "true"
+
+ cls.logger.debug("Creating Network Offering on zone %s" % (cls.zone.id))
+ cls.network_offering = NetworkOffering.create(cls.api_client,
+ cls.services["isolated_network_offering"],
+ conservemode=True)
+
+ cls.network_offering.update(cls.api_client, state='Enabled')
+
+ cls.logger.debug("Creating Network for Account %s using offering %s" % (cls.account.name, cls.network_offering.id))
+ cls.services["network"]["name"] = "Test Network 1"
+ cls.services["network"]["gateway"] = "10.1.1.1"
+ cls.services["network"]["netmask"] = "255.255.255.0"
+ cls.network1 = Network.create(cls.api_client,
+ cls.services["network"],
+ accountid=cls.account.name,
+ domainid=cls.account.domainid,
+ networkofferingid=cls.network_offering.id,
+ zoneid=cls.zone.id)
+ cls.services["network"]["name"] = "Test Network 2"
+ cls.services["network"]["gateway"] = "10.1.2.1"
+ cls.services["network"]["netmask"] = "255.255.255.0"
+ cls.network2 = Network.create(cls.api_client,
+ cls.services["network"],
+ accountid=cls.account.name,
+ domainid=cls.account.domainid,
+ networkofferingid=cls.network_offering.id,
+ zoneid=cls.zone.id)
+ cls.logger.debug("Creating VM1 for Account %s using offering %s with IP 10.1.1.50" % (cls.account.name, cls.service_offering.id))
+ cls.vm_1 = VirtualMachine.create(cls.api_client,
+ cls.services["virtual_machine"],
+ templateid=cls.template.id,
+ accountid=cls.account.name,
+ domainid=cls.domain.id,
+ serviceofferingid=cls.service_offering.id,
+ networkids=[str(cls.network1.id),str(cls.network2.id)])
+
+ cls.logger.debug("Creating VM2 for Account %s using offering %s with IP 10.1.1.51" % (cls.account.name, cls.service_offering.id))
+ cls.vm_2 = VirtualMachine.create(cls.api_client,
+ cls.services["virtual_machine"],
+ templateid=cls.template.id,
+ accountid=cls.account.name,
+ domainid=cls.domain.id,
+ serviceofferingid=cls.service_offering.id,
+ networkids=[str(cls.network2.id),str(cls.network1.id)])
+
+ cls.services["natrule1"] = {
+ "privateport": 22,
+ "publicport": 222,
+ "protocol": "TCP"
+ }
+
+ cls.services["natrule2"] = {
+ "privateport": 22,
+ "publicport": 223,
+ "protocol": "TCP"
+ }
+
+ cls.services["configurableData"] = {
+ "host": {
+ "port": 22
+ },
+ "input": "INPUT",
+ "forward": "FORWARD"
+ }
+
+ cls._cleanup = [
+ cls.vm_1,
+ cls.vm_2,
+ cls.network1,
+ cls.network2,
+ cls.network_offering,
+ cls.service_offering,
+ cls.account
+ ]
+
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ cleanup_resources(cls.api_client, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.hypervisor = self.testClient.getHypervisorInfo()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def test_ssh_command(self, vm, nat_rule, rule_label):
+ result = 'failed'
+ try:
+ ssh_command = "ping -c 3 8.8.8.8"
+ self.logger.debug("SSH into VM with IP: %s" % nat_rule.ipaddress)
+
+ ssh = vm.get_ssh_client(ipaddress=nat_rule.ipaddress, port=self.services[rule_label]["publicport"], retries=5)
+ result = str(ssh.execute(ssh_command))
+
+ self.logger.debug("SSH result: %s; COUNT is ==> %s" % (result, result.count(" 0% packet loss")))
+ except:
+ self.fail("Failed to SSH into VM - %s" % (nat_rule.ipaddress))
+
+ self.assertEqual(
+ result.count(" 0% packet loss"),
+ 1,
+ "Ping to outside world from VM should be successful"
+ )
+
+ def test_dhcphopts(self, ipaddress, router):
+ hosts = list_hosts(
+ self.apiclient,
+ id=router.hostid)
+
+ self.assertEqual(
+ isinstance(hosts, list),
+ True,
+ "Check for list hosts response return valid data")
+
+ host = hosts[0]
+ host.user = self.hostConfig['username']
+ host.passwd = self.hostConfig['password']
+ host.port = self.services["configurableData"]["host"]["port"]
+
+ host_tag = ipaddress.replace(".","_")
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
+ result = get_process_status(
+ self.apiclient.connection.mgtSvr,
+ 22,
+ self.apiclient.connection.user,
+ self.apiclient.connection.passwd,
+ router.linklocalip,
+ "cat /etc/dhcpopts.txt | grep %s" % (host_tag),
+ hypervisor=self.hypervisor)
+ else:
+ try:
+ result = get_process_status(
+ host.ipaddress,
+ host.port,
+ host.user,
+ host.passwd,
+ router.linklocalip,
+ "cat /etc/dhcpopts.txt | grep %s" % (host_tag))
+ except KeyError:
+ self.skipTest(
+ "Provide a marvin config file with host\
+ credentials to run %s" %
+ self._testMethodName)
+
+ self.logger.debug("cat /etc/dhcpopts.txt | grep %s RESULT IS ==> %s" % (host_tag, result))
+ res = str(result)
+
+ self.assertNotEqual(
+ res.count(host_tag),
+ 0,
+ "DHCP opts file does not contain exception for IP ==> %s!" % res)
+
+ @attr(tags=["advanced", "advancedns", "ssh"], required_hardware="true")
+ def test_router_dhcp_opts(self):
+ """Check that the /etc/dhcpopts.txt has entries for the"""
+
+ self.logger.debug("Starting test_router_dhcphosts...")
+ routers = list_routers(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ networkid=self.network1.id
+ )
+ self.assertEqual(
+ isinstance(routers, list),
+ True,
+ "Check for list routers response return valid data"
+ )
+
+ self.assertNotEqual(
+ len(routers),
+ 0,
+ "Check list router response"
+ )
+ network1_router = routers[0]
+
+ routers = list_routers(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ networkid=self.network2.id
+ )
+ self.assertEqual(
+ isinstance(routers, list),
+ True,
+ "Check for list routers response return valid data"
+ )
+
+ self.assertNotEqual(
+ len(routers),
+ 0,
+ "Check list router response"
+ )
+ network2_router = routers[0]
+
+ self.assertEqual(
+ network1_router.state,
+ 'Running',
+ "Check list router response for router state"
+ )
+ self.assertEqual(
+ network2_router.state,
+ 'Running',
+ "Check list router response for router state"
+ )
+ public_ips = list_publicIP(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ zoneid=self.zone.id,
+ associatednetworkid=self.network1.id
+ )
+
+ self.assertEqual(
+ isinstance(public_ips, list),
+ True,
+ "Check for list public IPs response return valid data"
+ )
+
+ network1_public_ip = public_ips[0]
+
+ public_ips = list_publicIP(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ zoneid=self.zone.id,
+ associatednetworkid=self.network2.id
+ )
+
+ self.assertEqual(
+ isinstance(public_ips, list),
+ True,
+ "Check for list public IPs response return valid data"
+ )
+ network2_public_ip = public_ips[0]
+
+ self.logger.debug("Creating Firewall rule for VM ID: %s" % self.vm_1.id)
+ FireWallRule.create(
+ self.apiclient,
+ ipaddressid=network1_public_ip.id,
+ protocol=self.services["natrule1"]["protocol"],
+ cidrlist=['0.0.0.0/0'],
+ startport=self.services["natrule1"]["publicport"],
+ endport=self.services["natrule1"]["publicport"]
+ )
+
+ self.logger.debug("Creating NAT rule for VM ID: %s" % self.vm_1.id)
+ # Create NAT rule
+ nat_rule1 = NATRule.create(
+ self.apiclient,
+ self.vm_1,
+ self.services["natrule1"],
+ network1_public_ip.id
+ )
+
+ self.logger.debug("Creating Firewall rule for VM ID: %s" % self.vm_2.id)
+ FireWallRule.create(
+ self.apiclient,
+ ipaddressid=network2_public_ip.id,
+ protocol=self.services["natrule2"]["protocol"],
+ cidrlist=['0.0.0.0/0'],
+ startport=self.services["natrule2"]["publicport"],
+ endport=self.services["natrule2"]["publicport"]
+ )
+
+ self.logger.debug("Creating NAT rule for VM ID: %s" % self.vm_2.id)
+ # Create NAT rule
+ nat_rule2 = NATRule.create(
+ self.apiclient,
+ self.vm_2,
+ self.services["natrule2"],
+ network2_public_ip.id
+ )
+
+ nat_rules = list_nat_rules(
+ self.apiclient,
+ id=nat_rule1.id
+ )
+ self.assertEqual(
+ isinstance(nat_rules, list),
+ True,
+ "Check for list NAT rules response return valid data"
+ )
+ self.assertEqual(
+ nat_rules[0].state,
+ 'Active',
+ "Check list port forwarding rules"
+ )
+
+ nat_rules = list_nat_rules(
+ self.apiclient,
+ id=nat_rule2.id
+ )
+ self.assertEqual(
+ isinstance(nat_rules, list),
+ True,
+ "Check for list NAT rules response return valid data"
+ )
+ self.assertEqual(
+ nat_rules[0].state,
+ 'Active',
+ "Check list port forwarding rules"
+ )
+
+ self.logger.debug("Testing DHCP options for VMs %s and %s" % (self.vm_1.id, self.vm_2.id))
+ self.test_dhcphopts(self.vm_2.nic[1].ipaddress, network1_router)
+ self.test_dhcphopts(self.vm_1.nic[0].ipaddress, network2_router)
+
+ return
[2/2] git commit: updated refs/heads/4.8 to 90ae04b
Posted by bh...@apache.org.
Merge pull request #1766 from murali-reddy/vr-default-network-gateway
CLOUDSTACK-9598: wrong defaut gateway for the nic in non-default network when guest VM has nic's in more than one guest network set the tag for each host in /etc/dhcphosts.txt, and use the tag to add exception in /etc/dhcpopts.txt to prevent sending default route, dns server in case if the nic is in non-default network
this was the behaviour with edithosts.sh prior to 4.6
* pr/1766:
CLOUDSTACK-9598: wrong defaut gateway for the nic in non-default network
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/90ae04b7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/90ae04b7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/90ae04b7
Branch: refs/heads/4.8
Commit: 90ae04b79177a43076270016303b62baf3e4aa4d
Parents: ff616e7 7ab35e6
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 24 12:39:32 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 24 12:39:36 2016 +0530
----------------------------------------------------------------------
.../debian/config/opt/cloud/bin/cs/CsDhcp.py | 22 +-
test/integration/smoke/test_router_dhcphosts.py | 372 ++++++++++++++++++-
2 files changed, 388 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90ae04b7/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
----------------------------------------------------------------------