openstack
diff --git a/‎openstackclient/api/compute_v2.py‎
Lines changed: 211 additions & 0 deletions b/‎openstackclient/api/compute_v2.py‎
Lines changed: 211 additions & 0 deletions
diff --git a/‎openstackclient/compute/client.py‎
Lines changed: 22 additions & 0 deletions b/‎openstackclient/compute/client.py‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎openstackclient/compute/v2/server.py‎
Lines changed: 5 additions & 11 deletions b/‎openstackclient/compute/v2/server.py‎
Lines changed: 5 additions & 11 deletions
diff --git a/‎openstackclient/network/v2/security_group.py‎
Lines changed: 16 additions & 20 deletions b/‎openstackclient/network/v2/security_group.py‎
Lines changed: 16 additions & 20 deletions
@@ -0,0 +1,211 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+"""Compute v2 API Library"""
+
+from keystoneauth1 import exceptions as ksa_exceptions
+from osc_lib.api import api
+from osc_lib import exceptions
+from osc_lib.i18n import _
+
+
+class APIv2(api.BaseAPI):
+    """Compute v2 API"""
+
+    def __init__(self, **kwargs):
+        super(APIv2, self).__init__(**kwargs)
+
+    # Overrides
+
+    # TODO(dtroyer): Override find() until these fixes get into an osc-lib
+    #                minimum release
+    def find(
+        self,
+        path,
+        value=None,
+        attr=None,
+    ):
+        """Find a single resource by name or ID
+
+        :param string path:
+            The API-specific portion of the URL path
+        :param string value:
+            search expression (required, really)
+        :param string attr:
+            name of attribute for secondary search
+        """
+
+        try:
+            ret = self._request('GET', "/%s/%s" % (path, value)).json()
+            if isinstance(ret, dict):
+                # strip off the enclosing dict
+                key = list(ret.keys())[0]
+                ret = ret[key]
+        except (
+            ksa_exceptions.NotFound,
+            ksa_exceptions.BadRequest,
+        ):
+            kwargs = {attr: value}
+            try:
+                ret = self.find_one(path, **kwargs)
+            except ksa_exceptions.NotFound:
+                msg = _("%s not found") % value
+                raise exceptions.NotFound(msg)
+
+        return ret
+
+    # Security Groups
+
+    def security_group_create(
+        self,
+        name=None,
+        description=None,
+    ):
+        """Create a new security group
+
+        https://developer.openstack.org/api-ref/compute/#create-security-group
+
+        :param string name:
+            Security group name
+        :param integer description:
+            Security group description
+        """
+
+        url = "/os-security-groups"
+
+        params = {
+            'name': name,
+            'description': description,
+        }
+
+        return self.create(
+            url,
+            json={'security_group': params},
+        )['security_group']
+
+    def security_group_delete(
+        self,
+        security_group=None,
+    ):
+        """Delete a security group
+
+        https://developer.openstack.org/api-ref/compute/#delete-security-group
+
+        :param string security_group:
+            Security group name or ID
+        """
+
+        url = "/os-security-groups"
+
+        security_group = self.find(
+            url,
+            attr='name',
+            value=security_group,
+        )['id']
+        if security_group is not None:
+            return self.delete('/%s/%s' % (url, security_group))
+
+        return None
+
+    def security_group_find(
+        self,
+        security_group=None,
+    ):
+        """Return a security group given name or ID
+
+        https://developer.openstack.org/api-ref/compute/#show-security-group-details
+
+        :param string security_group:
+            Security group name or ID
+        :returns: A dict of the security group attributes
+        """
+
+        url = "/os-security-groups"
+
+        return self.find(
+            url,
+            attr='name',
+            value=security_group,
+        )
+
+    def security_group_list(
+        self,
+        limit=None,
+        marker=None,
+        search_opts=None,
+    ):
+        """Get security groups
+
+        https://developer.openstack.org/api-ref/compute/#list-security-groups
+
+        :param integer limit:
+            query return count limit
+        :param string marker:
+            query marker
+        :param search_opts:
+            (undocumented) Search filter dict
+            all_tenants: True|False - return all projects
+        :returns:
+            list of security groups names
+        """
+
+        params = {}
+        if search_opts is not None:
+            params = dict((k, v) for (k, v) in search_opts.items() if v)
+        if limit:
+            params['limit'] = limit
+        if marker:
+            params['offset'] = marker
+
+        url = "/os-security-groups"
+        return self.list(url, **params)["security_groups"]
+
+    def security_group_set(
+        self,
+        security_group=None,
+        # name=None,
+        # description=None,
+        **params
+    ):
+        """Update a security group
+
+        https://developer.openstack.org/api-ref/compute/#update-security-group
+
+        :param string security_group:
+            Security group name or ID
+
+        TODO(dtroyer): Create an update method in osc-lib
+        """
+
+        # Short-circuit no-op
+        if params is None:
+            return None
+
+        url = "/os-security-groups"
+
+        security_group = self.find(
+            url,
+            attr='name',
+            value=security_group,
+        )
+        if security_group is not None:
+            for (k, v) in params.items():
+                # Only set a value if it is already present
+                if k in security_group:
+                    security_group[k] = v
+            return self._request(
+                "PUT",
+                "/%s/%s" % (url, security_group['id']),
+                json={'security_group': security_group},
+            ).json()['security_group']
+        return None
@@ -31,6 +31,11 @@
     "2.1": "novaclient.client",
 }
 
+COMPUTE_API_TYPE = 'compute'
+COMPUTE_API_VERSIONS = {
+    '2': 'openstackclient.api.compute_v2.APIv2',
+}
+
 # Save the microversion if in use
 _compute_api_version = None
 
@@ -58,6 +63,13 @@ def make_client(instance):
 
     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
 
@@ -77,6 +89,16 @@ 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
 
 
 
@@ -22,18 +22,14 @@
 import os
 import sys
 
+from novaclient.v2 import servers
 from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 from oslo_utils import timeutils
 import six
 
-try:
-    from novaclient.v2 import servers
-except ImportError:
-    from novaclient.v1_1 import servers
-
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
@@ -316,12 +312,11 @@ def take_action(self, parsed_args):
             compute_client.servers,
             parsed_args.server,
         )
-        security_group = utils.find_resource(
-            compute_client.security_groups,
+        security_group = compute_client.api.security_group_find(
             parsed_args.group,
         )
 
-        server.add_security_group(security_group.id)
+        server.add_security_group(security_group['id'])
 
 
 class AddServerVolume(command.Command):
@@ -1437,12 +1432,11 @@ def take_action(self, parsed_args):
             compute_client.servers,
             parsed_args.server,
         )
-        security_group = utils.find_resource(
-            compute_client.security_groups,
+        security_group = compute_client.api.security_group_find(
             parsed_args.group,
         )
 
-        server.remove_security_group(security_group.id)
+        server.remove_security_group(security_group['id'])
 
 
 class RemoveServerVolume(command.Command):
 
@@ -140,13 +140,13 @@ def take_action_network(self, client, parsed_args):
 
     def take_action_compute(self, client, parsed_args):
         description = self._get_description(parsed_args)
-        obj = client.security_groups.create(
+        obj = client.api.security_group_create(
             parsed_args.name,
             description,
         )
         display_columns, property_columns = _get_columns(obj)
         data = utils.get_dict_properties(
-            obj._info,
+            obj,
             property_columns,
             formatters=_formatters_compute
         )
@@ -174,8 +174,7 @@ def take_action_network(self, client, parsed_args):
         client.delete_security_group(obj)
 
     def take_action_compute(self, client, parsed_args):
-        data = utils.find_resource(client.security_groups, self.r)
-        client.security_groups.delete(data.id)
+        client.api.security_group_delete(self.r)
 
 
 # TODO(rauta): Use the SDK resource mapped attribute names once
@@ -242,7 +241,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.security_groups.list(search_opts=search)
+        data = client.api.security_group_list(
+            # TODO(dtroyer): add limit, marker
+            search_opts=search,
+        )
 
         columns = (
             "ID",
@@ -254,7 +256,7 @@ def take_action_compute(self, client, parsed_args):
             columns = columns + ('Tenant ID',)
             column_headers = column_headers + ('Project',)
         return (column_headers,
-                (utils.get_item_properties(
+                (utils.get_dict_properties(
                     s, columns,
                 ) for s in data))
 
@@ -294,23 +296,20 @@ def take_action_network(self, client, parsed_args):
         client.update_security_group(obj, **attrs)
 
     def take_action_compute(self, client, parsed_args):
-        data = utils.find_resource(
-            client.security_groups,
-            parsed_args.group,
-        )
+        data = client.api.security_group_find(parsed_args.group)
 
         if parsed_args.name is not None:
-            data.name = parsed_args.name
+            data['name'] = parsed_args.name
         if parsed_args.description is not None:
-            data.description = parsed_args.description
+            data['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.security_groups.update(
+        client.api.security_group_set(
             data,
-            data.name,
-            data.description,
+            data['name'],
+            data['description'],
         )
 
 
@@ -337,13 +336,10 @@ def take_action_network(self, client, parsed_args):
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
-        obj = utils.find_resource(
-            client.security_groups,
-            parsed_args.group,
-        )
+        obj = client.api.security_group_find(parsed_args.group)
         display_columns, property_columns = _get_columns(obj)
         data = utils.get_dict_properties(
-            obj._info,
+            obj,
             property_columns,
             formatters=_formatters_compute
         )