network: Replace use of in-tree API client

None of these are actually supported by openstacksdk (intentionally so)
so we add our own manual implementations.

Change-Id: Ifd24f04ae4d1e56e0ce5ba0afe63828403bb7a6f
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/api/compute_v2.py

@@ -31,7 +31,6 @@
     "2.1": "novaclient.client",
 }
 
-COMPUTE_API_TYPE = 'compute'
 COMPUTE_API_VERSIONS = {
     '2': 'openstackclient.api.compute_v2.APIv2',
 }
@@ -63,15 +62,6 @@ def make_client(instance):
         #                fallback to use the max version of novaclient side.
         version = novaclient.API_MAX_VERSION
 
-    LOG.debug('Instantiating compute client for %s', version)
-
-    compute_api = utils.get_client_class(
-        API_NAME,
-        version.ver_major,
-        COMPUTE_API_VERSIONS,
-    )
-    LOG.debug('Instantiating compute api: %s', compute_api)
-
     # Set client http_log_debug to True if verbosity level is high enough
     http_log_debug = utils.get_effective_log_level() <= logging.DEBUG
 
@@ -94,16 +84,6 @@ def make_client(instance):
         **kwargs
     )
 
-    client.api = compute_api(
-        session=instance.session,
-        service_type=COMPUTE_API_TYPE,
-        endpoint=instance.get_endpoint_for_service_type(
-            COMPUTE_API_TYPE,
-            region_name=instance.region_name,
-            interface=instance.interface,
-        ),
-    )
-
     return client
 
 

openstackclient/compute/client.py

@@ -552,8 +552,9 @@ def take_action_network(self, client, parsed_args):
                 raise error
 
     def take_action_compute(self, client, parsed_args):
-        client.api.floating_ip_add(
-            parsed_args.server,
+        server = client.find_server(parsed_args.server, ignore_missing=False)
+        client.add_floating_ip_to_server(
+            server,
             parsed_args.ip_address,
             fixed_address=parsed_args.fixed_ip_address,
         )
@@ -3921,10 +3922,8 @@ def take_action_network(self, client, parsed_args):
         client.update_ip(obj, **attrs)
 
     def take_action_compute(self, client, parsed_args):
-        client.api.floating_ip_remove(
-            parsed_args.server,
-            parsed_args.ip_address,
-        )
+        server = client.find_server(parsed_args.server, ignore_missing=False)
+        client.remove_floating_ip_from_server(server, parsed_args.ip_address)
 
 
 class RemovePort(command.Command):

openstackclient/compute/v2/server.py

@@ -161,7 +161,7 @@ def take_action(self, parsed_args):
             )
         elif self.is_nova_network:
             return self.take_action_compute(
-                self.app.client_manager.compute, parsed_args
+                self.app.client_manager.sdk_connection.compute, parsed_args
             )
 
     def take_action_network(self, client, parsed_args):
@@ -210,7 +210,8 @@ def take_action(self, parsed_args):
                     )
                 else:
                     self.take_action_compute(
-                        self.app.client_manager.compute, parsed_args
+                        self.app.client_manager.sdk_connection.compute,
+                        parsed_args,
                     )
             except Exception as e:
                 msg = _(
@@ -267,7 +268,7 @@ def take_action(self, parsed_args):
                 )
             else:
                 return self.take_action_compute(
-                    self.app.client_manager.compute, parsed_args
+                    self.app.client_manager.sdk_connection.compute, parsed_args
                 )
         except openstack.exceptions.HttpException as exc:
             msg = _("Error while executing command: %s") % exc.message

openstackclient/network/common.py

@@ -9,18 +9,17 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 """IP Floating action implementations"""
 
 from osc_lib import utils
 from osc_lib.utils import tags as _tag
 
+from openstackclient.api import compute_v2
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
 
-
 _formatters = {
     'port_details': utils.format_dict,
 }
@@ -200,7 +199,7 @@ def take_action_network(self, client, parsed_args):
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
-        obj = client.api.floating_ip_create(parsed_args.network)
+        obj = compute_v2.create_floating_ip(client, parsed_args.network)
         columns = _get_columns(obj)
         data = utils.get_dict_properties(obj, columns)
         return (columns, data)
@@ -230,7 +229,7 @@ def take_action_network(self, client, parsed_args):
         client.delete_ip(obj)
 
     def take_action_compute(self, client, parsed_args):
-        client.api.floating_ip_delete(self.r)
+        compute_v2.delete_floating_ip(client, self.r)
 
 
 class ListFloatingIP(common.NetworkAndComputeLister):
@@ -421,8 +420,7 @@ def take_action_compute(self, client, parsed_args):
             'Pool',
         )
 
-        data = client.api.floating_ip_list()
-
+        objs = compute_v2.list_floating_ips(client)
         return (
             headers,
             (
@@ -431,7 +429,7 @@ def take_action_compute(self, client, parsed_args):
                     columns,
                     formatters={},
                 )
-                for s in data
+                for s in objs
             ),
         )
 
@@ -538,7 +536,7 @@ def take_action_network(self, client, parsed_args):
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
-        obj = client.api.floating_ip_find(parsed_args.floating_ip)
+        obj = compute_v2.get_floating_ip(client, parsed_args.floating_ip)
         columns = _get_columns(obj)
         data = utils.get_dict_properties(obj, columns)
         return (columns, data)

openstackclient/network/v2/floating_ip.py

@@ -9,14 +9,12 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 """Floating IP Pool action implementations"""
 
-
 from osc_lib import exceptions
-from osc_lib import utils
 
+from openstackclient.api import compute_v2
 from openstackclient.i18n import _
 from openstackclient.network import common
 
@@ -33,15 +31,8 @@ def take_action_network(self, client, parsed_args):
 
     def take_action_compute(self, client, parsed_args):
         columns = ('Name',)
-        data = client.api.floating_ip_pool_list()
-
-        return (
-            columns,
-            (
-                utils.get_dict_properties(
-                    s,
-                    columns,
-                )
-                for s in data
-            ),
-        )
+        data = [
+            (x['name'],) for x in compute_v2.list_floating_ip_pools(client)
+        ]
+
+        return (columns, data)

openstackclient/network/v2/floating_ip_pool.py

@@ -9,7 +9,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 """Network action implementations"""
 
@@ -18,6 +17,7 @@
 from osc_lib import utils
 from osc_lib.utils import tags as _tag
 
+from openstackclient.api import compute_v2
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
@@ -388,7 +388,7 @@ def take_action_network(self, client, parsed_args):
 
     def take_action_compute(self, client, parsed_args):
         attrs = _get_attrs_compute(self.app.client_manager, parsed_args)
-        obj = client.api.network_create(**attrs)
+        obj = compute_v2.create_network(client, **attrs)
         display_columns, columns = _get_columns_compute(obj)
         data = utils.get_dict_properties(obj, columns)
         return (display_columns, data)
@@ -416,7 +416,8 @@ def take_action_network(self, client, parsed_args):
         client.delete_network(obj)
 
     def take_action_compute(self, client, parsed_args):
-        client.api.network_delete(self.r)
+        network = compute_v2.find_network(client, self.r)
+        compute_v2.delete_network(client, network['id'])
 
 
 # TODO(sindhu): Use the SDK resource mapped attribute names once the
@@ -673,7 +674,7 @@ def take_action_compute(self, client, parsed_args):
             'Subnet',
         )
 
-        data = client.api.network_list()
+        data = compute_v2.list_networks(client)
 
         return (
             column_headers,
@@ -828,7 +829,7 @@ def take_action_network(self, client, parsed_args):
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
-        obj = client.api.network_find(parsed_args.network)
+        obj = compute_v2.find_network(client, parsed_args.network)
         display_columns, columns = _get_columns_compute(obj)
         data = utils.get_dict_properties(obj, columns)
         return (display_columns, data)

openstackclient/network/v2/network.py

@@ -20,6 +20,7 @@
 from osc_lib import utils
 from osc_lib.utils import tags as _tag
 
+from openstackclient.api import compute_v2
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
@@ -180,7 +181,8 @@ def take_action_network(self, client, parsed_args):
 
     def take_action_compute(self, client, parsed_args):
         description = self._get_description(parsed_args)
-        obj = client.api.security_group_create(
+        obj = compute_v2.create_security_group(
+            client,
             parsed_args.name,
             description,
         )
@@ -212,7 +214,8 @@ def take_action_network(self, client, parsed_args):
         client.delete_security_group(obj)
 
     def take_action_compute(self, client, parsed_args):
-        client.api.security_group_delete(self.r)
+        security_group = compute_v2.find_security_group(client, self.r)
+        compute_v2.delete_security_group(client, security_group['id'])
 
 
 # TODO(rauta): Use the SDK resource mapped attribute names once
@@ -291,10 +294,10 @@ def take_action_network(self, client, parsed_args):
         )
 
     def take_action_compute(self, client, parsed_args):
-        search = {'all_tenants': parsed_args.all_projects}
-        data = client.api.security_group_list(
+        data = compute_v2.list_security_groups(
             # TODO(dtroyer): add limit, marker
-            search_opts=search,
+            client,
+            all_projects=parsed_args.all_projects,
         )
 
         columns = (
@@ -383,20 +386,21 @@ def take_action_network(self, client, parsed_args):
         _tag.update_tags_for_set(client, obj, parsed_args)
 
     def take_action_compute(self, client, parsed_args):
-        data = client.api.security_group_find(parsed_args.group)
+        security_group = compute_v2.find_security_group(
+            client, parsed_args.group
+        )
 
+        params = {}
         if parsed_args.name is not None:
-            data['name'] = parsed_args.name
+            params['name'] = parsed_args.name
         if parsed_args.description is not None:
-            data['description'] = parsed_args.description
+            params['description'] = parsed_args.description
 
         # NOTE(rtheis): Previous behavior did not raise a CommandError
         # if there were no updates. Maintain this behavior and issue
         # the update.
-        client.api.security_group_set(
-            data,
-            data['name'],
-            data['description'],
+        compute_v2.update_security_group(
+            client, security_group['id'], **params
         )
 
 
@@ -422,7 +426,7 @@ def take_action_network(self, client, parsed_args):
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
-        obj = client.api.security_group_find(parsed_args.group)
+        obj = compute_v2.find_security_group(client, parsed_args.group)
         display_columns, property_columns = _get_columns(obj)
         data = utils.get_dict_properties(
             obj, property_columns, formatters=_formatters_compute