diff options
| author | Abishek Subramanian <absubram@cisco.com> | 2014-03-21 03:08:46 -0400 |
|---|---|---|
| committer | Abishek Subramanian <absubram@cisco.com> | 2014-03-21 12:41:21 -0400 |
| commit | 72b2d8685ced2ac37f7a7b72c9bd31f4355b2da9 (patch) | |
| tree | 341b103871095bacfdf277045b1fd85821c89d11 /openstack_dashboard/test | |
| parent | 537dbacdcc316a60fe7c456d9a96f773c9c73948 (diff) | |
| download | horizon-72b2d8685ced2ac37f7a7b72c9bd31f4355b2da9.tar.gz | |
Add missing trunk segment type option for profile create
The Cisco N1K plugin allows for 'trunk' type network profiles to
be created in addition to existing 'vlan' and 'overlay' types.
This fix is to add to the segment_type choices in forms.py to
include the missing 'trunk' choice. Additionally the description
message has been updated to make sure strings are uniform in all
locations. The help string for the multicast range has also been
updated to reflect a valid mcast IP and finally new unit tests
have been added.
Closes-bug: #1285298
Change-Id: Ifc6d2952f2e37d6757fe7a432cffdb8fe36ffc61
Diffstat (limited to 'openstack_dashboard/test')
| -rw-r--r-- | openstack_dashboard/test/test_data/neutron_data.py | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/openstack_dashboard/test/test_data/neutron_data.py b/openstack_dashboard/test/test_data/neutron_data.py index 6445833f7..e64af7862 100644 --- a/openstack_dashboard/test/test_data/neutron_data.py +++ b/openstack_dashboard/test/test_data/neutron_data.py @@ -911,3 +911,47 @@ def data(TEST): TEST.api_network_profile_binding.add(network_profile_binding_dict) TEST.network_profile_binding.add(neutron.Profile( network_profile_binding_dict)) + + # 3rd network profile for network when using the cisco n1k plugin + # Profile applied on 1st network + net_profile_dict = {'name': 'net_profile_test3', + 'segment_type': 'overlay', + 'sub_type': 'other', + 'other_subtype': 'GRE', + 'segment_range': '11000-11100', + 'id': + '00000000-3333-3333-3333-000000000000', + 'project': '1'} + + TEST.api_net_profiles.add(net_profile_dict) + TEST.net_profiles.add(neutron.Profile(net_profile_dict)) + + # 3rd network profile binding + network_profile_binding_dict = {'profile_id': + '00000000-3333-3333-3333-000000000000', + 'tenant_id': '1'} + + TEST.api_network_profile_binding.add(network_profile_binding_dict) + TEST.network_profile_binding.add(neutron.Profile( + network_profile_binding_dict)) + + # 4th network profile for network when using the cisco n1k plugin + # Profile applied on 1st network + net_profile_dict = {'name': 'net_profile_test4', + 'segment_type': 'trunk', + 'sub_type_trunk': 'vlan', + 'id': + '00000000-4444-4444-4444-000000000000', + 'project': '1'} + + TEST.api_net_profiles.add(net_profile_dict) + TEST.net_profiles.add(neutron.Profile(net_profile_dict)) + + # 4th network profile binding + network_profile_binding_dict = {'profile_id': + '00000000-4444-4444-4444-000000000000', + 'tenant_id': '1'} + + TEST.api_network_profile_binding.add(network_profile_binding_dict) + TEST.network_profile_binding.add(neutron.Profile( + network_profile_binding_dict)) |