Merge "Re-implement novaclient bits removed in 10.0"

Author: Zuul

openstackclient/api/compute_v2.py

@@ -93,7 +93,51 @@ def find(
 
         return ret
 
-    # Flaoting IPs
+    # Floating IPs
+
+    def floating_ip_add(
+        self,
+        server,
+        address,
+        fixed_address=None,
+    ):
+        """Add a floating IP to a server
+
+        :param server:
+            The :class:`Server` (or its ID) to add an IP to.
+        :param address:
+            The FloatingIP or string floating address to add.
+        :param fixed_address:
+            The FixedIP the floatingIP should be associated with (optional)
+        """
+
+        url = '/servers'
+
+        server = self.find(
+            url,
+            attr='name',
+            value=server,
+        )
+
+        address = address.ip if hasattr(address, 'ip') else address
+        if fixed_address:
+            if hasattr(fixed_address, 'ip'):
+                fixed_address = fixed_address.ip
+
+            body = {
+                'address': address,
+                'fixed_address': fixed_address,
+            }
+        else:
+            body = {
+                'address': address,
+            }
+
+        return self._request(
+            "POST",
+            "/%s/%s/action" % (url, server['id']),
+            json={'addFloatingIp': body},
+        )
 
     def floating_ip_create(
         self,
@@ -175,6 +219,38 @@ def floating_ip_list(
 
         return self.list(url)["floating_ips"]
 
+    def floating_ip_remove(
+        self,
+        server,
+        address,
+    ):
+        """Remove a floating IP from a server
+
+        :param server:
+            The :class:`Server` (or its ID) to add an IP to.
+        :param address:
+            The FloatingIP or string floating address to add.
+        """
+
+        url = '/servers'
+
+        server = self.find(
+            url,
+            attr='name',
+            value=server,
+        )
+
+        address = address.ip if hasattr(address, 'ip') else address
+        body = {
+            'address': address,
+        }
+
+        return self._request(
+            "POST",
+            "/%s/%s/action" % (url, server['id']),
+            json={'removeFloatingIp': body},
+        )
+
     # Floating IP Pools
 
     def floating_ip_pool_list(
@@ -192,6 +268,84 @@ def floating_ip_pool_list(
 
         return self.list(url)["floating_ip_pools"]
 
+    # Hosts
+
+    def host_list(
+        self,
+        zone=None,
+    ):
+        """Lists hypervisor Hosts
+
+        https://developer.openstack.org/api-ref/compute/#list-hosts
+        Valid for Compute 2.0 - 2.42
+
+        :param string zone:
+            Availability zone
+        :returns: A dict of the floating IP attributes
+        """
+
+        url = "/os-hosts"
+        if zone:
+            url = '/os-hosts?zone=%s' % zone
+
+        return self.list(url)["hosts"]
+
+    def host_set(
+        self,
+        host=None,
+        status=None,
+        maintenance_mode=None,
+        **params
+    ):
+        """Modify host properties
+
+        https://developer.openstack.org/api-ref/compute/#update-host-status
+        Valid for Compute 2.0 - 2.42
+
+        status
+        maintenance_mode
+        """
+
+        url = "/os-hosts"
+
+        params = {}
+        if status:
+            params['status'] = status
+        if maintenance_mode:
+            params['maintenance_mode'] = maintenance_mode
+        if params == {}:
+            # Don't bother calling if nothing given
+            return None
+        else:
+            return self._request(
+                "PUT",
+                "/%s/%s" % (url, host),
+                json=params,
+            ).json()
+
+    def host_show(
+        self,
+        host=None,
+    ):
+        """Show host
+
+        https://developer.openstack.org/api-ref/compute/#show-host-details
+        Valid for Compute 2.0 - 2.42
+        """
+
+        url = "/os-hosts"
+
+        r_host = self.find(
+            url,
+            attr='host_name',
+            value=host,
+        )
+
+        data = []
+        for h in r_host:
+            data.append(h['resource'])
+        return data
+
     # Networks
 
     def network_create(

openstackclient/compute/v2/host.py

@@ -40,9 +40,9 @@ def take_action(self, parsed_args):
             "Service",
             "Zone"
         )
-        data = compute_client.hosts.list_all(parsed_args.zone)
+        data = compute_client.api.host_list(parsed_args.zone)
         return (columns,
-                (utils.get_item_properties(
+                (utils.get_dict_properties(
                     s, columns,
                 ) for s in data))
 
@@ -95,13 +95,7 @@ def take_action(self, parsed_args):
 
         compute_client = self.app.client_manager.compute
 
-        # More than one hosts will be returned by using find_resource()
-        # so that the return value cannot be used in host update() method.
-        # find_resource() is just used for checking existence of host and
-        # keeping the exception message consistent with other commands.
-        utils.find_resource(compute_client.hosts, parsed_args.host)
-
-        compute_client.hosts.update(
+        compute_client.api.host_set(
             parsed_args.host,
             kwargs
         )
@@ -128,8 +122,10 @@ def take_action(self, parsed_args):
             "Memory MB",
             "Disk GB"
         )
-        data = compute_client.hosts.get(parsed_args.host)
+
+        data = compute_client.api.host_show(parsed_args.host)
+
         return (columns,
-                (utils.get_item_properties(
+                (utils.get_dict_properties(
                     s, columns,
                 ) for s in data))

openstackclient/compute/v2/server.py

@@ -32,6 +32,7 @@
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
+from openstackclient.network import common as network_common
 
 
 LOG = logging.getLogger(__name__)
@@ -234,11 +235,10 @@ def take_action(self, parsed_args):
         )
 
 
-class AddFloatingIP(command.Command):
+class AddFloatingIP(network_common.NetworkAndComputeCommand):
     _description = _("Add floating IP address to server")
 
-    def get_parser(self, prog_name):
-        parser = super(AddFloatingIP, self).get_parser(prog_name)
+    def update_parser_common(self, parser):
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -252,19 +252,37 @@ def get_parser(self, prog_name):
         parser.add_argument(
             "--fixed-ip-address",
             metavar="<ip-address>",
-            help=_("Fixed IP address to associate with this floating IP "
-                   "address"),
+            help=_(
+                "Fixed IP address to associate with this floating IP address"
+            ),
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action_network(self, client, parsed_args):
         compute_client = self.app.client_manager.compute
 
+        attrs = {}
+        obj = client.find_ip(
+            parsed_args.ip_address,
+            ignore_missing=False,
+        )
         server = utils.find_resource(
-            compute_client.servers, parsed_args.server)
+            compute_client.servers,
+            parsed_args.server,
+        )
+        port = list(client.ports(device_id=server.id))[0]
+        attrs['port_id'] = port.id
+        if parsed_args.fixed_ip_address:
+            attrs['fixed_ip_address'] = parsed_args.fixed_ip_address
+
+        client.update_ip(obj, **attrs)
 
-        server.add_floating_ip(parsed_args.ip_address,
-                               parsed_args.fixed_ip_address)
+    def take_action_compute(self, client, parsed_args):
+        client.api.floating_ip_add(
+            parsed_args.server,
+            parsed_args.ip_address,
+            fixed_address=parsed_args.fixed_ip_address,
+        )
 
 
 class AddPort(command.Command):
@@ -1482,11 +1500,10 @@ def take_action(self, parsed_args):
         server.remove_fixed_ip(parsed_args.ip_address)
 
 
-class RemoveFloatingIP(command.Command):
+class RemoveFloatingIP(network_common.NetworkAndComputeCommand):
     _description = _("Remove floating IP address from server")
 
-    def get_parser(self, prog_name):
-        parser = super(RemoveFloatingIP, self).get_parser(prog_name)
+    def update_parser_common(self, parser):
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -1501,13 +1518,21 @@ def get_parser(self, prog_name):
         )
         return parser
 
-    def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
+    def take_action_network(self, client, parsed_args):
+        attrs = {}
+        obj = client.find_ip(
+            parsed_args.ip_address,
+            ignore_missing=False,
+        )
+        attrs['port_id'] = None
 
-        server = utils.find_resource(
-            compute_client.servers, parsed_args.server)
+        client.update_ip(obj, **attrs)
 
-        server.remove_floating_ip(parsed_args.ip_address)
+    def take_action_compute(self, client, parsed_args):
+        client.api.floating_ip_remove(
+            parsed_args.server,
+            parsed_args.ip_address,
+        )
 
 
 class RemovePort(command.Command):

openstackclient/network/common.py

@@ -48,7 +48,10 @@ def get_parser(self, prog_name):
         parser = super(NetworkAndComputeCommand, self).get_parser(prog_name)
         parser = self.update_parser_common(parser)
         LOG.debug('common parser: %s', parser)
-        if self.app.client_manager.is_network_endpoint_enabled():
+        if (
+            self.app is None or
+            self.app.client_manager.is_network_endpoint_enabled()
+        ):
             return self.update_parser_network(parser)
         else:
             return self.update_parser_compute(parser)