Adds nova client support for nova-manage network command

Adds the following commands:
- nova network-disassociate
- nova network-associate-host
- nova network-associate-project
- nova network-create

This patch depends on https://review.openstack.org/#/c/15491/

Change-Id: I44c7d0bf6ba545cf1ed6f6f8390bab836fe52f9d
Implements: blueprint apis-for-nova-manage

Author: Chris Yeoh

novaclient/v1_1/networks.py

@@ -91,14 +91,47 @@ def create(self, **kwargs):
         body = {"network": kwargs}
         return self._create('/os-networks', body, 'network')
 
-    def disassociate(self, network):
+    def disassociate(self, network, disassociate_host=True,
+                     disassociate_project=True):
         """
-        Disassociate a specific network from project.
+        Disassociate a specific network from project and/or host.
 
-        :param network: The ID of the :class:`Network` to get.
+        :param network: The ID of the :class:`Network`.
+        :param disassociate_host: Whether to disassociate the host
+        :param disassociate_project: Whether to disassociate the project
+        """
+        if disassociate_host and disassociate_project:
+            body = {"disassociate": None}
+        elif disassociate_project:
+            body = {"disassociate_project": None}
+        elif disassociate_host:
+            body = {"disassociate_host": None}
+        else:
+            raise CommandError(
+                "Must disassociate either host or project or both")
+
+        self.api.client.post("/os-networks/%s/action" % base.getid(network),
+                             body=body)
+
+    def associate_host(self, network, host):
+        """
+        Associate a specific network with a host.
+
+        :param network: The ID of the :class:`Network`.
+        :param host: The name of the host to associate the network with
         """
         self.api.client.post("/os-networks/%s/action" % base.getid(network),
-                             body={"disassociate": None})
+                             body={"associate_host": host})
+
+    def associate_project(self, network):
+        """
+        Associate a specific network with a project.
+
+        The project is defined by the project authenticated against
+
+        :param network: The ID of the :class:`Network`.
+        """
+        self.api.client.post("/os-networks/add", body={"id": network})
 
     def add(self, network=None):
         """

novaclient/v1_1/shell.py

@@ -512,6 +512,134 @@ def do_network_show(cs, args):
     utils.print_dict(network._info)
 
 
+@utils.arg('--host-only',
+           dest='host_only',
+           metavar='<0|1>',
+           nargs='?',
+           type=int,
+           const=1,
+           default=0)
+@utils.arg('--project-only',
+           dest='project_only',
+           metavar='<0|1>',
+           nargs='?',
+           type=int,
+           const=1,
+           default=0)
+@utils.arg('network',
+     metavar='<network>',
+     help="uuid of network")
+def do_network_disassociate(cs, args):
+    """Disassociate host and/or project from the given network."""
+    if args.host_only:
+        cs.networks.disassociate(args.network, True, False)
+    elif args.project_only:
+        cs.networks.disassociate(args.network, False, True)
+    else:
+        cs.networks.disassociate(args.network, True, True)
+
+
+@utils.arg('network',
+     metavar='<network>',
+     help="uuid of network")
+@utils.arg('host',
+     metavar='<host>',
+     help="Name of host")
+def do_network_associate_host(cs, args):
+    """Associate host with network."""
+    cs.networks.associate_host(args.network, args.host)
+
+
+@utils.arg('network',
+     metavar='<network>',
+     help="uuid of network")
+def do_network_associate_project(cs, args):
+    """Associate project with network."""
+    cs.networks.associate_project(args.network)
+
+
+def _filter_network_create_options(args):
+    valid_args = ['label', 'cidr', 'vlan', 'vpn_start', 'cidr_v6', 'gateway',
+                  'gateway_v6', 'bridge', 'multi_host', 'dns1', 'dns2', 'uuid',
+                  'fixed_cidr', 'project_id', 'priority']
+    kwargs = {}
+    for k, v in args.__dict__.items():
+        if k in valid_args and v is not None:
+            kwargs[k] = v
+
+    return kwargs
+
+
+@utils.arg('label',
+     metavar='<network_label>',
+     help="Label for network")
+@utils.arg('--fixed-range-v4',
+     dest='cidr',
+     metavar='<x.x.x.x/yy>',
+     help="IPv4 subnet (ex: 10.0.0.0/8)")
+@utils.arg('--fixed-range-v6',
+     dest="cidr_v6",
+     help='IPv6 subnet (ex: fe80::/64')
+@utils.arg('--vlan',
+     dest='vlan',
+     metavar='<vlan id>',
+     help="vlan id")
+@utils.arg('--vpn',
+     dest='vpn_start',
+     metavar='<vpn start>',
+     help="vpn start")
+@utils.arg('--gateway',
+     dest="gateway",
+     help='gateway')
+@utils.arg('--gateway-v6',
+     dest="gateway_v6",
+     help='ipv6 gateway')
+@utils.arg('--bridge',
+     dest="bridge",
+     metavar='<bridge>',
+     help='VIFs on this network are connected to this bridge')
+@utils.arg('--bridge-interface',
+     dest="bridge_interface",
+     metavar='<bridge interface>',
+     help='the bridge is connected to this interface')
+@utils.arg('--multi-host',
+     dest="multi_host",
+     metavar="<'T'|'F'>",
+     help='Multi host')
+@utils.arg('--dns1',
+     dest="dns1",
+     metavar="<DNS Address>", help='First DNS')
+@utils.arg('--dns2',
+     dest="dns2",
+     metavar="<DNS Address>",
+     help='Second DNS')
+@utils.arg('--uuid',
+     dest="uuid",
+     metavar="<network uuid>",
+     help='Network UUID')
+@utils.arg('--fixed-cidr',
+     dest="fixed_cidr",
+     metavar='<x.x.x.x/yy>',
+     help='IPv4 subnet for fixed IPS (ex: 10.20.0.0/16)')
+@utils.arg('--project-id',
+     dest="project_id",
+     metavar="<project id>",
+     help='Project id')
+@utils.arg('--priority',
+     dest="priority",
+     metavar="<number>",
+     help='Network interface priority')
+def do_network_create(cs, args):
+    """Create a network."""
+
+    if not (args.cidr or args.cidr_v6):
+        raise exceptions.CommandError(
+            "Must specify eith fixed_range_v4 or fixed_range_v6")
+    kwargs = _filter_network_create_options(args)
+
+    cs.networks.create(**kwargs)
+
+
 def do_image_list(cs, _args):
     """Print a list of available images to boot from."""
     image_list = cs.images.list()

tests/v1_1/fakes.py

@@ -1164,3 +1164,15 @@ def get_os_fping_1(self, **kw):
                 }
             }
         )
+
+    def post_os_networks(self, **kw):
+        return (202, {'network': kw})
+
+    def post_os_networks_1_action(self, **kw):
+        return (202, None)
+
+    def post_os_networks_networktest_action(self, **kw):
+        return (202, None)
+
+    def post_os_networks_2_action(self, **kw):
+        return (202, None)

tests/v1_1/test_networks.py

@@ -29,11 +29,30 @@ def test_create(self):
                          {'network': {'label': 'foo'}})
         self.assertTrue(isinstance(f, networks.Network))
 
+    def test_associate_project(self):
+        cs.networks.associate_project('networktest')
+        cs.assert_called('POST', '/os-networks/add', {'id': 'networktest'})
+
+    def test_associate_host(self):
+        cs.networks.associate_host('networktest', 'testHost')
+        cs.assert_called('POST', '/os-networks/networktest/action',
+                         {'associate_host': 'testHost'})
+
     def test_disassociate(self):
         cs.networks.disassociate('networkdisassociate')
         cs.assert_called('POST', '/os-networks/networkdisassociate/action',
                          {'disassociate': None})
 
+    def test_disassociate_host_only(self):
+        cs.networks.disassociate('networkdisassociate', True, False)
+        cs.assert_called('POST', '/os-networks/networkdisassociate/action',
+                         {'disassociate_host': None})
+
+    def test_disassociate_project(self):
+        cs.networks.disassociate('networkdisassociate', False, True)
+        cs.assert_called('POST', '/os-networks/networkdisassociate/action',
+                         {'disassociate_project': None})
+
     def test_add(self):
         cs.networks.add('networkadd')
         cs.assert_called('POST', '/os-networks/add',

tests/v1_1/test_shell.py

@@ -629,6 +629,50 @@ def test_cloudpipe_configure(self):
                                       'vpn_port': '1234'}}
         self.assert_called('PUT', '/os-cloudpipe/configure-project', body)
 
+    def test_network_associate_host(self):
+        self.run_command('network-associate-host 1 testHost')
+        body = {'associate_host': 'testHost'}
+        self.assert_called('POST', '/os-networks/1/action', body)
+
+    def test_network_associate_project(self):
+        self.run_command('network-associate-project 1')
+        body = {'id': "1"}
+        self.assert_called('POST', '/os-networks/add', body)
+
+    def test_network_disassociate(self):
+        self.run_command('network-disassociate 1')
+        body = {'disassociate': None}
+        self.assert_called('POST', '/os-networks/1/action', body)
+
+    def test_network_disassociate_host(self):
+        self.run_command('network-disassociate --host-only 1 2')
+        body = {'disassociate_host': None}
+        self.assert_called('POST', '/os-networks/2/action', body)
+
+    def test_network_disassociate(self):
+        self.run_command('network-disassociate --project-only 1 2')
+        body = {'disassociate_project': None}
+        self.assert_called('POST', '/os-networks/2/action', body)
+
+    def test_network_create_v4(self):
+        self.run_command('network-create --fixed-range-v4 10.0.1.0/24 \
+                          new_network')
+        body = {'cidr': '10.0.1.0/24', 'label': 'new_network'}
+        self.assert_called('POST', '/os-networks', body)
+
+    def test_network_create_v4(self):
+        self.run_command('network-create --fixed-range-v4 10.0.1.0/24 \
+                         --dns1 10.0.1.254 new_network')
+        body = {'network': {'cidr': '10.0.1.0/24', 'label': 'new_network',
+                            'dns1': '10.0.1.254'}}
+        self.assert_called('POST', '/os-networks', body)
+
+    def test_network_create_v6(self):
+        self.run_command('network-create --fixed-range-v6 2001::/64 \
+                          new_network')
+        body = {'network': {'cidr_v6': '2001::/64', 'label': 'new_network'}}
+        self.assert_called('POST', '/os-networks', body)
+
     def test_backup(self):
         self.run_command('backup sample-server back1 daily 1')
         self.assert_called('POST', '/servers/1234/action',