Merge lp:~seyeongkim/charms/trusty/neutron-api/lp1545886 into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[Seyeong Kim]

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

charm_lint_check #728 neutron-api-next for xtrusia mp286269
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/728/

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

charm_unit_test #633 neutron-api-next for xtrusia mp286269
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/633/

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

charm_amulet_test #282 neutron-api-next for xtrusia mp286269
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/15099691/
Build: http://10.245.162.36:8080/job/charm_amulet_test/282/

Unmerged revisions

176. By Seyeong Kim on 2016-02-17

add vni_ranges option

=== modified file 'config.yaml'
--- config.yaml	2016-01-22 15:14:59 +0000
+++ config.yaml	2016-02-17 09:53:01 +0000
@@ -126,6 +126,11 @@
       <physical_network> specifying physical_network names usable for VLAN
       provider and tenant networks, as well as ranges of VLAN tags on each
       available for allocation to tenant networks.
+  vni-ranges:
+    type: string
+    default: "1001:2000"
+    description: |
+      Space-delimited list of <vxlan_min>:<vxlan_max> for VXLAN provider.
   # Quota configuration settings
   quota-security-group:
     default: 10

=== modified file 'hooks/neutron_api_context.py'
--- hooks/neutron_api_context.py	2016-01-22 15:14:59 +0000
+++ hooks/neutron_api_context.py	2016-02-17 09:53:01 +0000
@@ -228,6 +228,10 @@
         if vlan_ranges:
             ctxt['vlan_ranges'] = ','.join(vlan_ranges.split())
 
+        vni_ranges = config('vni-ranges')
+        if vni_ranges:
+            ctxt['vni_ranges'] = ','.join(vni_ranges.split())
+
         ctxt['enable_ml2_port_security'] = config('enable-ml2-port-security')
 
         return ctxt

=== modified file 'templates/icehouse/ml2_conf.ini'
--- templates/icehouse/ml2_conf.ini	2015-11-09 14:06:56 +0000
+++ templates/icehouse/ml2_conf.ini	2016-02-17 09:53:01 +0000
@@ -16,7 +16,7 @@
 tunnel_id_ranges = 1:1000
 
 [ml2_type_vxlan]
-vni_ranges = 1001:2000
+vni_ranges = {{ vni_ranges }}
 
 [ml2_type_vlan]
 network_vlan_ranges = {{ vlan_ranges }}

=== modified file 'templates/kilo/ml2_conf.ini'
--- templates/kilo/ml2_conf.ini	2015-11-07 05:08:13 +0000
+++ templates/kilo/ml2_conf.ini	2016-02-17 09:53:01 +0000
@@ -20,7 +20,7 @@
 tunnel_id_ranges = 1:1000
 
 [ml2_type_vxlan]
-vni_ranges = 1001:2000
+vni_ranges = {{ vni_ranges }}
 
 [ml2_type_vlan]
 network_vlan_ranges = {{ vlan_ranges }}

=== modified file 'unit_tests/test_neutron_api_context.py'
--- unit_tests/test_neutron_api_context.py	2016-01-22 15:14:59 +0000
+++ unit_tests/test_neutron_api_context.py	2016-02-17 09:53:01 +0000
@@ -319,6 +319,7 @@
             'quota_subnet': 10,
             'quota_vip': 10,
             'vlan_ranges': 'physnet1:1000:2000',
+            'vni_ranges': '1001:2000',
             'enable_ml2_port_security': True
         }
         napi_ctxt = context.NeutronCCContext()
@@ -354,6 +355,7 @@
             'quota_subnet': 10,
             'quota_vip': 10,
             'vlan_ranges': 'physnet1:1000:2000',
+            'vni_ranges': '1001:2000',
             'network_providers': 'physnet2,physnet3',
             'enable_ml2_port_security': True
         }
@@ -395,6 +397,7 @@
             'quota_subnet': 10,
             'quota_vip': 10,
             'vlan_ranges': 'physnet1:1000:2000',
+            'vni_ranges': '1001:2000',
             'enable_ml2_port_security': True
         }
         napi_ctxt = context.NeutronCCContext()