From cbc2b5b56dcf9999b6fdc745a3db0d11bba16aff Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Fri, 24 May 2019 10:50:26 -0700 Subject: [PATCH] bug1824442 --- manila/api/views/share_networks.py | 2 -- manila/tests/api/v2/test_share_networks.py | 3 --- manila/tests/api/views/test_share_networks.py | 6 ++---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/manila/api/views/share_networks.py b/manila/api/views/share_networks.py index 2f5d3560..330d16f5 100644 --- a/manila/api/views/share_networks.py +++ b/manila/api/views/share_networks.py @@ -47,8 +47,6 @@ class ViewBuilder(common.ViewBuilder): 'updated_at': share_network.get('updated_at'), 'neutron_net_id': share_network.get('neutron_net_id'), 'neutron_subnet_id': share_network.get('neutron_subnet_id'), - 'network_type': share_network.get('network_type'), - 'segmentation_id': share_network.get('segmentation_id'), 'cidr': share_network.get('cidr'), 'ip_version': share_network.get('ip_version'), 'description': share_network.get('description'), diff --git a/manila/tests/api/v2/test_share_networks.py b/manila/tests/api/v2/test_share_networks.py index 3c7965b4..859da89f 100644 --- a/manila/tests/api/v2/test_share_networks.py +++ b/manila/tests/api/v2/test_share_networks.py @@ -99,9 +99,6 @@ class ShareNetworkAPITest(test.TestCase): view['neutron_net_id']) self.assertEqual(share_nw['neutron_subnet_id'], view['neutron_subnet_id']) - self.assertEqual(share_nw['network_type'], view['network_type']) - self.assertEqual(share_nw['segmentation_id'], - view['segmentation_id']) self.assertEqual(share_nw['cidr'], view['cidr']) self.assertEqual(share_nw['ip_version'], view['ip_version']) self.assertEqual(share_nw['name'], view['name']) diff --git a/manila/tests/api/views/test_share_networks.py b/manila/tests/api/views/test_share_networks.py index 41f552fc..42752dc7 100644 --- a/manila/tests/api/views/test_share_networks.py +++ b/manila/tests/api/views/test_share_networks.py @@ -52,8 +52,8 @@ class ViewBuilderTestCase(test.TestCase): req = fakes.HTTPRequest.blank('/share-networks', version=microversion) expected_keys = { 'id', 'name', 'project_id', 'created_at', 'updated_at', - 'neutron_net_id', 'neutron_subnet_id', 'network_type', - 'segmentation_id', 'cidr', 'ip_version', 'description'} + 'neutron_net_id', 'neutron_subnet_id', 'cidr', 'ip_version', + 'description'} if gateway_support: expected_keys.add('gateway') if mtu_support: @@ -116,8 +116,6 @@ class ViewBuilderTestCase(test.TestCase): 'updated_at': share_network.get('updated_at'), 'neutron_net_id': share_network.get('neutron_net_id'), 'neutron_subnet_id': share_network.get('neutron_subnet_id'), - 'network_type': share_network.get('network_type'), - 'segmentation_id': share_network.get('segmentation_id'), 'cidr': share_network.get('cidr'), 'ip_version': share_network.get('ip_version'), 'description': share_network.get('description'), -- 2.17.1