Merge lp:~gabriel-samfira/charms/trusty/neutron-api/next into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[Gabriel Samfira]

This adds the decomposed Hyper-V mechanism driver for Kilo. This will allow us to deploy the nova-hyperv charm with kilo.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #9320 neutron-api-next for gabriel-samfira mp270036
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/9320/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8618 neutron-api-next for gabriel-samfira mp270036
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8618/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6233 neutron-api-next for gabriel-samfira mp270036
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12270133/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6233/

[Ryan Beisner (1chb1n)]

Thank you for your work in this proposal. While I'll defer to a colleague for a review of the proposed content changes, I can help advise from the test perspective.

The amulet test will need to be updated in your branch to also expect the hyperv mechanism_driver in the ml2 config file for Trusty-Kilo and later.

Here is the specific failure point:
test_301_ml2_config DEBUG: Checking ml2 config file data...
...
section [ml2] mechanism_drivers:openvswitch,l2population,hyperv != expected mechanism_drivers:openvswitch,l2population
...
juju-test.conductor.017-basic-trusty-kilo DEBUG : Got exit code: 1

Here is an example from another charm test, solving a similar need:
http://bazaar.launchpad.net/~1chb1n/charms/trusty/keystone/amulet-svc-check-race-fix/view/head:/tests/basic_deployment.py#L402

review: Needs Fixing

[lp:~gabriel-samfira/charms/trusty/neutron-api/next]

138. By Gabriel Samfira on 2015-09-14

fix amulet test

This patch adds hyper-v to kilo, basically mirroring featureset of previous versions. Removed exception for kilo when checking mechanism drivers.

[Gabriel Samfira (gabriel-samfira)]

Hi Ryan,

Sorry for the late reply. This PR adds hyper-v to kilo, basically mirroring the previous versions feature-set. I modified the test and removed the condition that sets a different mechanism driver set for kilo.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #9934 neutron-api-next for gabriel-samfira mp270036
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/9934/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9154 neutron-api-next for gabriel-samfira mp270036
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9154/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6419 neutron-api-next for gabriel-samfira mp270036
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12409113/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6419/

[Gabriel Samfira (gabriel-samfira)]

Would love some unit-neutron-api-0 logs.

Unmerged revisions

138. By Gabriel Samfira on 2015-09-14

fix amulet test

This patch adds hyper-v to kilo, basically mirroring featureset of previous versions. Removed exception for kilo when checking mechanism drivers.

137. By Gabriel Samfira on 2015-09-03

Added Hyper-V mechanism driver

=== modified file 'hooks/neutron_api_utils.py'
--- hooks/neutron_api_utils.py	2015-09-04 11:03:14 +0000
+++ hooks/neutron_api_utils.py	2015-09-14 13:54:44 +0000
@@ -74,6 +74,7 @@
     'python-neutron-lbaas',
     'python-neutron-fwaas',
     'python-neutron-vpnaas',
+    'python-networking-hyperv',
 ]
 
 BASE_GIT_PACKAGES = [

=== modified file 'templates/kilo/ml2_conf.ini'
--- templates/kilo/ml2_conf.ini	2015-09-09 08:37:26 +0000
+++ templates/kilo/ml2_conf.ini	2015-09-14 13:54:44 +0000
@@ -4,6 +4,7 @@
 # Configuration file maintained by Juju. Local changes may be overwritten.  
 ###############################################################################
 [ml2]
+<<<<<<< TREE
 {% if neutron_plugin == 'Calico' -%}
 type_drivers = local,flat
 mechanism_drivers = calico
@@ -11,6 +12,11 @@
 type_drivers = {{ overlay_network_type }},vlan,flat,local
 tenant_network_types = {{ overlay_network_type }},vlan,flat,local
 mechanism_drivers = openvswitch,l2population
+=======
+type_drivers = {{ overlay_network_type }},vlan,flat
+tenant_network_types = {{ overlay_network_type }},vlan,flat
+mechanism_drivers = openvswitch,hyperv,l2population
+>>>>>>> MERGE-SOURCE
 
 [ml2_type_gre]
 tunnel_id_ranges = 1:1000

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-09-09 07:48:54 +0000
+++ tests/basic_deployment.py	2015-09-14 13:54:44 +0000
@@ -502,6 +502,7 @@
             }
         }
 
+<<<<<<< TREE
         if self._get_openstack_release() >= self.trusty_kilo:
             # Kilo or later
             expected['ml2'].update({
@@ -512,6 +513,13 @@
             expected['ml2'].update({
                 'mechanism_drivers': 'openvswitch,hyperv,l2population'
             })
+=======
+        expected['ml2'].update(
+            {
+                'mechanism_drivers': 'openvswitch,hyperv,l2population'
+            }
+        )
+>>>>>>> MERGE-SOURCE
 
         for section, pairs in expected.iteritems():
             ret = u.validate_config_data(unit, conf, section, pairs)