1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
:
: All rights reserved. This program and the accompanying materials
: are made available under the terms of the Apache License, Version 2.0
: which accompanies this distribution, and is available at
: http://www.apache.org/licenses/LICENSE-2.0
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 19 Aug 2017 02:03:01 +0200
Subject: [PATCH] maas: module: Obtain fabric ID from CIDR
MaaS subnet update requires specifying the correct fabric via reclass,
which we used to hardcode in our OPNFV reclass model to fabric-2.
However, fabric index numbers are not deterministic, so the old
method is unreliable.
Update MaaS custom py module to determine fabric name/ID on the
fly, based on CIDR matching (assuming we don't have CIDR conflicts).
This change maintains backwards compatibility:
- if fabric is specified via reclass model, it will be used as-is;
- if fabric is not specified via reclass model, we try to deduce it
based on CIDR; if no match is found, the old default ('') is used;
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
---
diff --git a/_modules/maas.py b/_modules/maas.py
--- a/_modules/maas.py
+++ b/_modules/maas.py
@@ -126,6 +126,8 @@
def process_single(name, config_data):
self._update = False
+ if isinstance(config_data, dict) and 'name' in config_data:
+ name = config_data['name']
try:
data = self.fill_data(name, config_data, **extra)
if data is None:
@@ -198,7 +198,8 @@
def fill_data(self, name, subnet, fabrics):
data = {
'name': name,
- 'fabric': str(fabrics[subnet.get('fabric', '')]),
+ 'fabric': str(fabrics[subnet.get('fabric',
+ self._get_fabric_from_cidr(subnet.get('cidr')))]),
'cidr': subnet.get('cidr'),
'gateway_ip': subnet['gateway_ip'],
}
@@ -215,6 +216,13 @@
self._process_iprange(res_json['id'])
return response
+ def _get_fabric_from_cidr(self, cidr):
+ subnets = json.loads(self._maas.get(u'api/2.0/subnets/').read())
+ for subnet in subnets:
+ if subnet['cidr'] == cidr:
+ return subnet['vlan']['fabric']
+ return ''
+
def _process_iprange(self, subnet_id):
ipranges = json.loads(self._maas.get(u'api/2.0/ipranges/').read())
LOG.warn('all %s ipranges %s', subnet_id, ipranges)
|
