← Back to branch summary

~ionutbalutoiu/charms/trusty/neutron-api/next

« back to all changes in this revision

Viewing changes to tests/basic_deployment.py

  • Committer: David Ames
  • Date: 2015-09-28 17:45:40 UTC
  • mfrom: (145 trunk)
  • mto: This revision was merged to the branch mainline in revision 146.
  • Revision ID: david.ames@canonical.com-20150928174540-wx0t0d3uwgmlsotb
Pull in upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/basic_deployment.py
481
481
 
482
482
        expected = {
483
483
            'ml2': {
484
 
                'type_drivers': 'gre,vlan,flat',
485
 
                'tenant_network_types': 'gre,vlan,flat',
 
484
                'type_drivers': 'gre,vlan,flat,local',
 
485
                'tenant_network_types': 'gre,vlan,flat,local',
486
486
            },
487
487
            'ml2_type_gre': {
488
488
                'tunnel_id_ranges': '1:1000'