~gnuoy/charms/trusty/quantum-gateway/add-nrpe-checks

« back to all changes in this revision

Viewing changes to unit_tests/test_quantum_contexts.py

  • Committer: james.page at ubuntu
  • Date: 2014-10-03 11:24:24 UTC
  • mfrom: (67.1.3 quantum-gateway)
  • Revision ID: james.page@ubuntu.com-20141003112424-8jio8r1i4f3ao12x
[gnuoy,r=james-page] Add support for configurable tenant network overlay type from neutron-api

Show diffs side-by-side

added added

removed removed

Lines of Context:
233
233
            'debug': False,
234
234
            'verbose': True,
235
235
            'l2_population': True,
 
236
            'overlay_network_type': 'gre',
236
237
        })
237
238
 
238
239
 
357
358
    def test_neutron_api_settings(self):
358
359
        self.relation_ids.return_value = ['foo']
359
360
        self.related_units.return_value = ['bar']
360
 
        self.test_relation.set({'l2-population': True})
 
361
        self.test_relation.set({'l2-population': True,
 
362
                                'overlay-network-type': 'gre', })
361
363
        self.relation_get.side_effect = self.test_relation.get
362
364
        self.assertEquals(quantum_contexts._neutron_api_settings(),
363
 
                          {'l2_population': True})
 
365
                          {'l2_population': True,
 
366
                           'overlay_network_type': 'gre'})
364
367
 
365
368
    def test_neutron_api_settings2(self):
366
369
        self.relation_ids.return_value = ['foo']
367
370
        self.related_units.return_value = ['bar']
368
 
        self.test_relation.set({'l2-population': False})
 
371
        self.test_relation.set({'l2-population': False,
 
372
                                'overlay-network-type': 'gre', })
369
373
        self.relation_get.side_effect = self.test_relation.get
370
374
        self.assertEquals(quantum_contexts._neutron_api_settings(),
371
 
                          {'l2_population': False})
 
375
                          {'l2_population': False,
 
376
                           'overlay_network_type': 'gre'})
372
377
 
373
378
    def test_neutron_api_settings_no_apiplugin(self):
374
379
        self.relation_ids.return_value = []
375
380
        self.assertEquals(quantum_contexts._neutron_api_settings(),
376
 
                          {'l2_population': True})
 
381
                          {'l2_population': True,
 
382
                           'overlay_network_type': 'gre', })