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

Proposed by Seyeong Kim
Status: Rejected
Rejected by: James Page
Proposed branch: lp:~seyeongkim/charms/trusty/neutron-gateway/lp1545886
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next
Diff against target: 76 lines (+13/-2)
5 files modified
config.yaml (+5/-0)
hooks/neutron_contexts.py (+4/-0)
templates/icehouse/ml2_conf.ini (+1/-1)
templates/juno/ml2_conf.ini (+1/-1)
unit_tests/test_neutron_contexts.py (+2/-0)
To merge this branch: bzr merge lp:~seyeongkim/charms/trusty/neutron-gateway/lp1545886
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+286257@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #724 neutron-gateway-next for xtrusia mp286257
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #631 neutron-gateway-next for xtrusia mp286257
    UNIT OK: passed

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

165. By Seyeong Kim on 2016-02-17

remove mistake

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #725 neutron-gateway-next for xtrusia mp286257
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #632 neutron-gateway-next for xtrusia mp286257
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #278 neutron-gateway-next for xtrusia mp286257
    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/15099168/
Build: http://10.245.162.36:8080/job/charm_amulet_test/278/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #279 neutron-gateway-next for xtrusia mp286257
    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/15099408/
Build: http://10.245.162.36:8080/job/charm_amulet_test/279/

Unmerged revisions

165. By Seyeong Kim on 2016-02-17

remove mistake

164. By Seyeong Kim on 2016-02-17

add vni-ranges option

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2015-11-17 13:46:49 +0000
3+++ config.yaml 2016-02-17 07:53:12 +0000
4@@ -183,6 +183,11 @@
5 <physical_network> specifying physical_network names usable for VLAN
6 provider and tenant networks, as well as ranges of VLAN tags on each
7 available for allocation to tenant networks.
8+ vni-ranges:
9+ type: string
10+ default: "1001:2000"
11+ description: |
12+ Space-delimited list of <vxlan_min>:<vxlan_max> for VXLAN provider.
13 # Network configuration options
14 # by default all access is over 'private-address'
15 os-data-network:
16
17=== modified file 'hooks/neutron_contexts.py'
18--- hooks/neutron_contexts.py 2015-11-17 13:46:49 +0000
19+++ hooks/neutron_contexts.py 2016-02-17 07:53:12 +0000
20@@ -155,6 +155,10 @@
21 if vlan_ranges:
22 ctxt['vlan_ranges'] = ','.join(vlan_ranges.split())
23
24+ vni_ranges = config('vni-ranges')
25+ if vni_ranges:
26+ ctxt['vni_ranges'] = ','.join(vni_ranges.split())
27+
28 dnsmasq_flags = config('dnsmasq-flags')
29 if dnsmasq_flags:
30 ctxt['dnsmasq_flags'] = config_flags_parser(dnsmasq_flags)
31
32=== modified file 'templates/icehouse/ml2_conf.ini'
33--- templates/icehouse/ml2_conf.ini 2015-09-14 15:07:45 +0000
34+++ templates/icehouse/ml2_conf.ini 2016-02-17 07:53:12 +0000
35@@ -11,7 +11,7 @@
36 tunnel_id_ranges = 1:1000
37
38 [ml2_type_vxlan]
39-vni_ranges = 1001:2000
40+vni_ranges = {{ vni_ranges }}
41
42 [ml2_type_vlan]
43 network_vlan_ranges = {{ vlan_ranges }}
44
45=== modified file 'templates/juno/ml2_conf.ini'
46--- templates/juno/ml2_conf.ini 2015-10-14 14:58:26 +0000
47+++ templates/juno/ml2_conf.ini 2016-02-17 07:53:12 +0000
48@@ -11,7 +11,7 @@
49 tunnel_id_ranges = 1:1000
50
51 [ml2_type_vxlan]
52-vni_ranges = 1001:2000
53+vni_ranges = {{ vni_ranges }}
54
55 [ml2_type_vlan]
56 network_vlan_ranges = {{ vlan_ranges }}
57
58=== modified file 'unit_tests/test_neutron_contexts.py'
59--- unit_tests/test_neutron_contexts.py 2015-11-20 09:19:09 +0000
60+++ unit_tests/test_neutron_contexts.py 2016-02-17 07:53:12 +0000
61@@ -128,6 +128,7 @@
62 self.test_config.set('vlan-ranges',
63 'physnet1:1000:2000 physnet2:2001:3000')
64 self.test_config.set('flat-network-providers', 'physnet3 physnet4')
65+ self.test_config.set('vni-ranges', '1001:2000')
66 # Provided by neutron-api relation
67 _rids.return_value = ['neutron-plugin-api:0']
68 _runits.return_value = ['neutron-api/0']
69@@ -152,6 +153,7 @@
70 'bridge_mappings': 'physnet1:br-data',
71 'network_providers': 'physnet3,physnet4',
72 'vlan_ranges': 'physnet1:1000:2000,physnet2:2001:3000',
73+ 'vni_ranges': '1001:2000',
74 'network_device_mtu': 9000,
75 'veth_mtu': 9000,
76 'dnsmasq_flags': {

Subscribers

People subscribed via source and target branches