Merge "Remove deprecated networks syntax" into feature/zuulv3

doc/source/configuration.rst

@@ -241,7 +241,7 @@ Example::
           availability-zones:
             - az1
           networks:
-            - name: 'some-network-name'
+            - some-network-name
           labels:
             - name: trusty
               min-ram: 8192
@@ -358,7 +358,7 @@ Example::
       availability-zones:
         - az1
       networks:
-        - name: 'some-network-name'
+        - some-network-name
       labels:
         - name: trusty
           min-ram: 8192
@@ -388,9 +388,9 @@ Example::
     control of the distribution you can use multiple logical providers each
     providing a different list of availabiltiy zones.
 
-  ``networks`` (dict)
+  ``networks`` (list)
     Specify custom Neutron networks that get attached to each
-    node. Specify the ``name`` of the network (a string).
+    node. Specify the name or id of the network as a string.
 
 
 .. _provider_diskimages:

nodepool/cmd/config_validator.py

@@ -29,16 +29,6 @@ class ConfigValidator:
             'cleanup': str,
         }
 
-        old_network = {
-            'net-id': str,
-            'net-label': str,
-        }
-
-        network = {
-            'name': v.Required(str),
-            'public': bool,  # Ignored, but kept for backwards compat
-        }
-
         pool_label = {
             v.Required('name'): str,
             v.Required('diskimage'): str,
@@ -48,7 +38,7 @@ class ConfigValidator:
 
         pool = {
             'name': str,
-            'networks': [v.Any(old_network, network)],
+            'networks': [str],
             'max-servers': int,
             'labels': [pool_label],
             'availability-zones': [str],

nodepool/config.py

@@ -125,11 +125,6 @@ class DiskImage(ConfigValue):
         return "<DiskImage %s>" % self.name
 
 
-class Network(ConfigValue):
-    def __repr__(self):
-        return "<Network name:%s id:%s>" % (self.name, self.id)
-
-
 def loadConfig(config_path):
     retry = 3
 
@@ -265,19 +260,7 @@ def loadConfig(config_path):
             p.pools[pp.name] = pp
             pp.max_servers = pool['max-servers']
             pp.azs = pool.get('availability-zones')
-            pp.networks = []
+            pp.networks = pool.get('networks', [])
-            for network in pool.get('networks', []):
-                n = Network()
-                pp.networks.append(n)
-                if 'net-id' in network:
-                    n.id = network['net-id']
-                    n.name = None
-                elif 'net-label' in network:
-                    n.name = network['net-label']
-                    n.id = None
-                else:
-                    n.name = network.get('name')
-                    n.id = None
             pp.labels = {}
             for label in pool.get('labels', []):
                 pl = ProviderLabel()

nodepool/fakeprovider.py

@@ -87,7 +87,9 @@ class FakeOpenStackCloud(object):
             networks = [dict(id='fake-public-network-uuid',
                              name='fake-public-network-name'),
                         dict(id='fake-private-network-uuid',
-                             name='fake-private-network-name')]
+                             name='fake-private-network-name'),
+                        dict(id='fake-ipv6-network-uuid',
+                             name='fake-ipv6-network-name')]
         self.networks = networks
         self._flavor_list = [
             Dummy(Dummy.FLAVOR, id='f1', ram=8192, name='Fake Flavor'),
@@ -103,8 +105,10 @@ class FakeOpenStackCloud(object):
         return None
 
     def get_network(self, name_or_id, filters=None):
-        return dict(id='fake-network-uuid',
+        for net in self.networks:
-                    name='fake-network-name')
+            if net['id'] == name_or_id or net['name'] == name_or_id:
+                return net
+        return self.networks[0]
 
     def _create(
             self, instance_list, instance_type=Dummy.INSTANCE,
@@ -115,7 +119,7 @@ class FakeOpenStackCloud(object):
         # if keyword 'ipv6-uuid' is found in provider config,
         # ipv6 address will be available in public addr dict.
         for nic in nics:
-            if 'ipv6-uuid' not in nic['net-id']:
+            if nic['net-id'] != 'fake-ipv6-network-uuid':
                 continue
             addresses = dict(
                 public=[dict(version=4, addr='fake'),
@@ -226,9 +230,6 @@ class FakeOpenStackCloud(object):
     def delete_server(self, name_or_id, delete_ips=True):
         self._delete(name_or_id, self._server_list)
 
-    def list_networks(self):
-        return dict(networks=self.networks)
-
 
 class FakeUploadFailCloud(FakeOpenStackCloud):
     log = logging.getLogger("nodepool.FakeUploadFailCloud")

nodepool/provider_manager.py

@@ -186,13 +186,8 @@ class ProviderManager(object):
             create_args['availability_zone'] = az
         nics = []
         for network in networks:
-            if network.id:
+            net_id = self.findNetwork(network)['id']
-                nics.append({'net-id': network.id})
+            nics.append({'net-id': net_id})
-            elif network.name:
-                net_id = self.findNetwork(network.name)['id']
-                nics.append({'net-id': net_id})
-            else:
-                raise Exception("Invalid 'networks' configuration.")
         if nics:
             create_args['nics'] = nics
         # Put provider.name and image_name in as groups so that ansible

nodepool/tests/fixtures/multiple_pools.yaml

@@ -31,8 +31,6 @@ providers:
         max-servers: 1
         availability-zones:
           - az1
-        networks:
-          - net-id: 'some-uuid'
         labels:
           - name: fake-label1
             diskimage: fake-image
@@ -43,8 +41,6 @@ providers:
         max-servers: 1
         availability-zones:
           - az2
-        networks:
-          - net-id: 'some-uuid'
         labels:
           - name: fake-label2
             diskimage: fake-image

nodepool/tests/fixtures/node.yaml

@@ -30,7 +30,7 @@ providers:
         availability-zones:
           - az1
         networks:
-          - net-id: 'some-uuid'
+          - net-name
         labels:
           - name: fake-label
             diskimage: fake-image

nodepool/tests/fixtures/node_az.yaml

@@ -27,8 +27,6 @@ providers:
     pools:
       - name: main
         max-servers: 96
-        networks:
-          - net-id: 'some-uuid'
         availability-zones:
           - az1
         labels:

nodepool/tests/fixtures/node_cmd.yaml

@@ -27,8 +27,6 @@ providers:
     pools:
       - name: main
         max-servers: 96
-        networks:
-          - net-id: 'some-uuid'
         labels:
           - name: fake-label1
             diskimage: fake-image1
@@ -46,8 +44,6 @@ providers:
     pools:
       - name: main
         max-servers: 96
-        networks:
-          - net-id: 'some-uuid'
         labels:
           - name: fake-label2
             diskimage: fake-image2

nodepool/tests/fixtures/node_disabled_label.yaml

@@ -27,8 +27,6 @@ providers:
     pools:
       - name: main
         max-servers: 96
-        networks:
-          - net-id: 'some-uuid'
         labels:
           - name: fake-label
             diskimage: fake-image

nodepool/tests/fixtures/node_diskimage_fail.yaml

@@ -27,8 +27,6 @@ providers:
     pools:
       - name: main
         max-servers: 96
-        networks:
-          - net-id: 'some-uuid'
         labels:
           - name: fake-label
             diskimage: fake-image

nodepool/tests/fixtures/node_diskimage_pause.yaml

@@ -30,8 +30,6 @@ providers:
     pools:
       - name: main
         max-servers: 96
-        networks:
-          - net-id: 'some-uuid'
         labels:
           - name: fake-label
             diskimage: fake-image

nodepool/tests/fixtures/node_ipv6.yaml

@@ -32,7 +32,9 @@ providers:
       - name: main
         max-servers: 96
         networks:
-          - net-id: 'ipv6-uuid'
+          # This activates a flag in fakeprovider to give us an ipv6
+          # network
+          - 'fake-ipv6-network-name'
         labels:
           - name: fake-label1
             diskimage: fake-image
@@ -48,7 +50,9 @@ providers:
       - name: main
         max-servers: 96
         networks:
-          - net-id: 'ipv6-uuid'
+          # This activates a flag in fakeprovider to give us an ipv6
+          # network
+          - 'fake-ipv6-network-name'
         labels:
           - name: fake-label2
             diskimage: fake-image
@@ -65,7 +69,7 @@ providers:
       - name: main
         max-servers: 96
         networks:
-          - net-id: 'some-uuid'
+          - 'some-name'
         labels:
           - name: fake-label3
             diskimage: fake-image

nodepool/tests/fixtures/node_launch_retry.yaml

@@ -24,8 +24,6 @@ providers:
       - name: fake-image
     pools:
       - name: main
-        networks:
-          - net-id: 'some-uuid'
         max-servers: 96
         labels:
           - name: fake-label

nodepool/tests/fixtures/node_net_name.yaml

@@ -25,9 +25,8 @@ providers:
       - name: main
         max-servers: 96
         networks:
-          - name: 'fake-public-network-name'
+          - 'fake-public-network-name'
-            public: true
+          - 'fake-private-network-name'
-          - name: 'fake-private-network-name'
         labels:
           - name: fake-label
             diskimage: fake-image