zuul/nodepool
Code Issues Proposed changes

Merge "Remove deprecated networks syntax" into feature/zuulv3

Browse Source
This commit is contained in:
Jenkins 2017-03-27 20:30:19 +00:00 committed by Gerrit Code Review
commit dbc0ae77d2
15 changed files with 26 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/configuration.rst
View File

@ -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:

12
nodepool/cmd/config_validator.py
View File

@ -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],

19
nodepool/config.py
View File

@ -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 = []
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.networks = pool.get('networks', [])
pp.labels = {}
for label in pool.get('labels', []):
pl = ProviderLabel()

15
nodepool/fakeprovider.py
View File

@ -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',
name='fake-network-name')
for net in self.networks:
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")

9
nodepool/provider_manager.py
View File

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

4
nodepool/tests/fixtures/multiple_pools.yaml vendored
View File

@ -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

2
nodepool/tests/fixtures/node.yaml vendored
View File

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

2
nodepool/tests/fixtures/node_az.yaml vendored
View File

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

4
nodepool/tests/fixtures/node_cmd.yaml vendored
View File

@ -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

2
nodepool/tests/fixtures/node_disabled_label.yaml vendored
View File

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

2
nodepool/tests/fixtures/node_diskimage_fail.yaml vendored
View File

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

2
nodepool/tests/fixtures/node_diskimage_pause.yaml vendored
View File

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

10
nodepool/tests/fixtures/node_ipv6.yaml vendored
View File

@ -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

2
nodepool/tests/fixtures/node_launch_retry.yaml vendored
View File

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

5
nodepool/tests/fixtures/node_net_name.yaml vendored
View File

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