Merge "Refactor network fakes to sdk properties PART 4"

Author: Zuul

openstackclient/network/v2/network_agent.py

@@ -50,7 +50,7 @@ def _get_network_columns(item):
         'is_admin_state_up': 'admin_state_up',
         'is_alive': 'alive',
     }
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'name']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,

openstackclient/network/v2/network_flavor_profile.py

@@ -29,7 +29,7 @@ def _get_columns(item):
         'is_enabled': 'enabled',
     }
 
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'name', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,
@@ -166,7 +166,7 @@ def take_action(self, parsed_args):
             'id',
             'driver',
             'is_enabled',
-            'metainfo',
+            'meta_info',
             'description',
         )
         column_headers = (

openstackclient/network/v2/network_rbac.py

@@ -30,7 +30,7 @@ def _get_columns(item):
     column_map = {
         'target_tenant': 'target_project_id',
     }
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'name', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,

openstackclient/network/v2/port.py

@@ -64,7 +64,7 @@ def _get_columns(item):
         'is_admin_state_up': 'admin_state_up',
         'is_port_security_enabled': 'port_security_enabled',
     }
-    hidden_columns = ['location']
+    hidden_columns = ['location', 'tenant_id']
     return utils.get_osc_show_columns_for_sdk_resource(
         item,
         column_map,

openstackclient/tests/unit/compute/v2/test_server.py

@@ -592,7 +592,7 @@ def setUp(self):
     def test_server_add_floating_ip(self):
         _server = compute_fakes.FakeServer.create_one_server()
         self.servers_mock.get.return_value = _server
-        _port = network_fakes.FakePort.create_one_port()
+        _port = network_fakes.create_one_port()
         _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
         self.network.find_ip = mock.Mock(return_value=_floating_ip)
         self.network.ports = mock.Mock(return_value=[_port])
@@ -661,7 +661,7 @@ def test_server_add_floating_ip_no_ports(self):
     def test_server_add_floating_ip_no_external_gateway(self, success=False):
         _server = compute_fakes.FakeServer.create_one_server()
         self.servers_mock.get.return_value = _server
-        _port = network_fakes.FakePort.create_one_port()
+        _port = network_fakes.create_one_port()
         _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
         self.network.find_ip = mock.Mock(return_value=_floating_ip)
         return_value = [_port]
@@ -717,7 +717,7 @@ def test_server_add_floating_ip_one_external_gateway(self):
     def test_server_add_floating_ip_with_fixed_ip(self):
         _server = compute_fakes.FakeServer.create_one_server()
         self.servers_mock.get.return_value = _server
-        _port = network_fakes.FakePort.create_one_port()
+        _port = network_fakes.create_one_port()
         _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
         self.network.find_ip = mock.Mock(return_value=_floating_ip)
         self.network.ports = mock.Mock(return_value=[_port])
@@ -759,7 +759,7 @@ def test_server_add_floating_ip_with_fixed_ip(self):
     def test_server_add_floating_ip_with_fixed_ip_no_port_found(self):
         _server = compute_fakes.FakeServer.create_one_server()
         self.servers_mock.get.return_value = _server
-        _port = network_fakes.FakePort.create_one_port()
+        _port = network_fakes.create_one_port()
         _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
         self.network.find_ip = mock.Mock(return_value=_floating_ip)
         self.network.ports = mock.Mock(return_value=[_port])