← Back to branch summary

~hopem/charms/trusty/neutron-openvswitch/ensure-tmpdir-cleanup

« back to all changes in this revision

Viewing changes to unit_tests/test_neutron_ovs_context.py

[hopem,r=gnuoy,wolsen]

Allow flat network providers to be configured seperately to vlan
providers.

Closes-Bug: 1444470

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_neutron_ovs_context.py
92
92
                  'use-syslog': True,
93
93
                  'verbose': True,
94
94
                  'debug': True,
95
 
                  'bridge-mappings': "physnet1:br-data physnet2:br-data"}
 
95
                  'bridge-mappings': "physnet1:br-data physnet2:br-data",
 
96
                  'flat-network-providers': 'physnet3 physnet4'}
96
97
 
97
98
        def mock_config(key=None):
98
99
            if key:
100
101
 
101
102
            return config
102
103
 
103
 
        self.maxDiff = None
104
 
        self.config.side_effect = mock_config 
 
104
        self.config.side_effect = mock_config
105
105
        _npa.side_effect = mock_npa
106
106
        _unit_get.return_value = '127.0.0.13'
107
107
        _unit_priv_ip.return_value = '127.0.0.14'
134
134
            'neutron_url': 'https://127.0.0.13:9696',
135
135
            'l2_population': True,
136
136
            'overlay_network_type': 'gre',
137
 
            'network_providers': 'physnet1,physnet2',
 
137
            'network_providers': 'physnet3,physnet4',
138
138
            'bridge_mappings': 'physnet1:br-data,physnet2:br-data',
139
139
            'vlan_ranges': 'physnet1:1000:1500,physnet2:2000:2500',
140
140
        }
199
199
            'neutron_url': 'https://127.0.0.13:9696',
200
200
            'l2_population': True,
201
201
            'overlay_network_type': 'gre',
202
 
            'network_providers': 'physnet1',
203
202
            'bridge_mappings': 'physnet1:br-data',
204
203
            'vlan_ranges': 'physnet1:1000:2000',
205
204
        }