Merge lp:~gnuoy/charms/trusty/cisco-vpp/amulet into lp:~openstack-charmers/charms/trusty/cisco-vpp/next

[Liam Young]

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-06-25 15:12:39 +0000
+++ tests/basic_deployment.py	2015-11-18 08:00:33 +0000
@@ -12,7 +12,6 @@
 from charmhelpers.contrib.openstack.amulet.utils import (
     OpenStackAmuletUtils,
     DEBUG,
-    ERROR
 )
 
 # Use DEBUG to turn on debug logging
@@ -46,26 +45,14 @@
         other_services = [
             {
                 'name': 'nova-compute',
-                'location':
-                'lp:~openstack-charmers/charms/trusty/nova-compute/vpp',
                 'constraints': {'mem': '8G'},
             },
             {
-                'name': 'neutron-api',
-                'location': 'lp:~openstack-charmers/charms/trusty/neutron-api/'
-                            'vpp'
-            },
-            {
                 'name': 'odl-controller',
-                'location': 'lp:~sdn-charmers/charms/trusty/odl-controller/'
-                            'odl-cmds',
                 'constraints': {'mem': '8G'},
             },
-            {
-                'name': 'neutron-api-odl',
-                'location': 'lp:~openstack-charmers/charms/trusty/'
-                            'neutron-api-odl/vpp',
-            },
+            {'name': 'neutron-api'},
+            {'name': 'neutron-api-odl'},
             {'name': 'mysql'},
             {'name': 'rabbitmq-server'},
             {'name': 'keystone'},
@@ -80,8 +67,6 @@
         relations = {
             'neutron-api:neutron-plugin-api-subordinate':
             'neutron-api-odl:neutron-plugin-api-subordinate',
-            'neutron-api:neutron-plugin-api':
-            'cisco-vpp:neutron-plugin-api',
             'nova-compute:neutron-plugin': 'cisco-vpp:neutron-plugin',
             'cisco-vpp:odl-controller': 'odl-controller:controller-api',
             'neutron-api-odl:odl-controller': 'odl-controller:controller-api',
@@ -113,11 +98,13 @@
             'manage-neutron-plugin-legacy-mode': False,
             'neutron-security-groups': False,
             'overlay-network-type': 'vxlan',
+            'openstack-origin': 'ppa:cisco-vpp/icehouse-proposed',
         }
         nova_compute = {
             'enable-live-migration': False,
             'manage-neutron-plugin-legacy-mode': False,
-            'openstack-origin': 'ppa:sdn-charmers/cisco-vpp-testing',
+            'openstack-origin': 'ppa:cisco-vpp/icehouse-proposed',
+            'hugepages': '1024',
         }
         keystone = {
             'admin-password': 'openstack',
@@ -128,9 +115,10 @@
         }
         odl_controller = {
             'install-url': resource_addr + odl_binary,
+            'profile': 'cisco-vpp',
         }
         cisco_vpp = {
-            'vpe-deb-url': resource_addr + '/vpe.deb.tgz',
+            'vpe-deb-url': resource_addr + '/vpe.deb',
             'overlay-network-type': 'vxlan',
         }
         neutron_api_odl = {
@@ -268,7 +256,7 @@
         }
         for line in output.split('\n'):
             columns = line.split()
-            if expect[columns[0]] < int(columns[2]):
+            if int(columns[2]) < expect[columns[0]]:
                 msg = 'Kernel setting {} too low ({} < {})'.format(
                     columns[0],
                     expect[columns[0]],
@@ -278,7 +266,6 @@
 
     def test_hugepage_sysctld_settings(self):
         unit = self.compute_sentry
-        shmmax_conf = unit.file_contents('/etc/sysctl.d/10-shmmax.conf')
         hugepage_conf = unit.file_contents('/etc/sysctl.d/10-hugepage.conf')
         expect = {
             'vm.max_map_count': 3072,
@@ -286,11 +273,11 @@
             'vm.hugetlb_shm_group': 0,
             'kernel.shmmax': 2147483648,
         }
-        for line in shmmax_conf.split('\n') + hugepage_conf.split('\n'):
+        for line in hugepage_conf.split('\n'):
             columns = line.split('=')
             if not columns[0]:
                 continue
-            if expect[columns[0]] < int(columns[1]):
+            if int(columns[1]) < expect[columns[0]]:
                 msg = 'Kernel setting {} too low ({} < {})'.format(
                     columns[0],
                     expect[columns[0]],
@@ -301,7 +288,8 @@
     def test_hugepage_mount_point(self):
         unit = self.compute_sentry
         mtab = unit.file_contents('/etc/mtab')
-        mnt_entry = [line for line in mtab.split('\n') if '/mnt/huge' in line]
+        mpoint = '/run/hugepages/kvm'
+        mnt_entry = [line for line in mtab.split('\n') if mpoint in line]
         if not mnt_entry:
             msg = 'Hugepage fs not found in mtab'
             amulet.raise_status(amulet.FAIL, msg=msg)
@@ -319,10 +307,10 @@
 
     def test_ssh_files(self):
         unit = self.compute_sentry
-        unit.file('/cisco/etc/confd/ssh/ssh_host_dsa_key')
-        unit.file('/cisco/etc/confd/ssh/ssh_host_dsa_key.pub')
-        unit.file('/cisco/etc/confd/ssh/ssh_host_rsa_key')
-        unit.file('/cisco/etc/confd/ssh/ssh_host_rsa_key.pub')
+        unit.file('/opt/cisco/vpe/etc/confd/ssh/ssh_host_dsa_key')
+        unit.file('/opt/cisco/vpe/etc/confd/ssh/ssh_host_dsa_key.pub')
+        unit.file('/opt/cisco/vpe/etc/confd/ssh/ssh_host_rsa_key')
+        unit.file('/opt/cisco/vpe/etc/confd/ssh/ssh_host_rsa_key.pub')
 
     def test_pkg_version(self):
         sentry = self.compute_sentry
@@ -344,28 +332,6 @@
                 settings[key] = value
         return settings
 
-    def test_ml2_config(self):
-        unit = self.compute_sentry
-        ml2_conf = unit.file_contents('/etc/neutron/plugins/ml2/ml2_conf.ini')
-        expected = {
-            'type_drivers': 'vxlan',
-            'username': 'admin',
-            'mechanism_drivers': 'opendaylight',
-            'url': 'http://10.5.34.203:8080/controller/nb/v2/neutron',
-            'firewall_driver':
-            'neutron.agent.linux.firewall.NoopFirewallDriver',
-            'enable_security_group': 'False',
-            'vni_ranges': '1001:2000',
-            'tenant_network_types': 'gre,vxlan,vlan,flat',
-            'password': 'admin',
-            'tunnel_id_ranges': '1:1000',
-        }
-        settings = self.parse_config(ml2_conf)
-        for key in expected.keys():
-            if expected[key] != settings[key]:
-                msg = 'Unexpected value in ml2_conf.ini'
-                amulet.raise_status(amulet.FAIL, msg=msg)
-
     def test_libvirt_config(self):
         unit = self.compute_sentry
         libvirt_conf = unit.file_contents('/etc/libvirt/libvirtd.conf')