with open('labconfig.yaml', 'r') as labf:
labcfg = yaml.load(labf)
-with open('deployment.yaml', 'r') as opnfvf:
- opnfvcfg = yaml.load(opnfvf)
-
-def setInDict(dataDict, mapList, value):
- getFromDict(dataDict, mapList[:-1])[mapList[-1]] = value
+opnfvcfg={}
+opnfvlabcfg={}
def getFromDict(dataDict, mapList):
return reduce(lambda d, k: d[k], mapList, dataDict)
-if len(labcfg["labconfig"]["nodes"]) < 3:
- print("minimum three nodes are needed for opnfv architecture deployment")
- exit()
+#lets define the bootstrap section
+opnfvcfg['demo-maas']={'juju-bootstrap':{'memory': 4096,'name': "bootstrap",\
+ 'pool': "default", 'vcpus': 4,\
+ 'disk_size': "60G", 'arch': "amd64",\
+ 'interfaces':[]},\
+ 'maas':{'memory': 4096,'pool': "default", 'vcpus': 4,\
+ 'disk_size': "160G", 'arch': "amd64", 'interfaces':[],\
+ 'name':"",'network_config':[],'node_group_ifaces':[],\
+ 'nodes':[],'password': 'ubuntu', 'user':'ubuntu',\
+ 'release': 'trusty', 'apt_sources':[],'ip_address':'',\
+ 'boot_source':{'keyring_filename':\
+ "/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg",\
+ 'url': \
+ "http://maas.ubuntu.com/images/ephemeral-v2/releases/",\
+ 'selections':{'1':{'arches':'amd64','labels':'release',\
+ 'os':'ubuntu','release':'xenial',\
+ 'subarches':'*'
+ }\
+ }\
+ },\
+ 'settings':{'maas_name':'','upstream_dns':'',\
+ 'main_archive':"http://us.archive.ubuntu.com/ubuntu"\
+ },\
+ 'virsh':{'rsa_priv_key':'/home/ubuntu/.ssh/id_rsa',
+ 'rsa_pub_key':'/home/ubuntu/.ssh/id_rsa.pub',
+ 'uri':''
+ }\
+ }\
+ }
+
+opnfvlabcfg['opnfv']={'ext-port':'','floating-ip-range':'','dataNetwork':'','ceph-disk':'/srv/',\
+ 'storageNetwork':'','interface-enable':'','publicNetwork':''}
+
+opnfvcfg['demo-maas']['maas']['apt_sources'].append("ppa:maas/stable")
+opnfvcfg['demo-maas']['maas']['apt_sources'].append("ppa:juju/stable")
# lets modify the maas general settings:
-updns = getFromDict(labcfg, ["labconfig","labsettings","upstream_dns"])
-setInDict(opnfvcfg, ["demo-maas", "maas", "settings", "upstream_dns"], updns)
-value = getFromDict(labcfg, ["labconfig","lab_location"])
-setInDict(opnfvcfg, ["demo-maas", "maas", "settings", "maas_name"], value)
-setInDict(opnfvcfg, ["demo-maas", "maas", "name"], "opnfv-"+value)
+updns = getFromDict(labcfg, ["lab","racks",0,"dns"])
+opnfvcfg["demo-maas"]["maas"]["settings"]["upstream_dns"]=updns
+
+location = getFromDict(labcfg, ["lab","location"])
+rack = getFromDict(labcfg, ["lab","racks",0,"rack"])
+value=location+rack
-#lets figure out the interfaces data
+opnfvcfg["demo-maas"]["maas"]["settings"]["maas_name"]=value
+opnfvcfg["demo-maas"]["maas"]["name"]="opnfv-"+value
ethbrAdm=""
ethbrAdmin=""
c=0
y=0
-z=0
+#z=0
-while c < len(labcfg["labconfig"]["bridges"]):
- brtype = getFromDict(labcfg, ["labconfig","bridges",c,"type"])
- brname = getFromDict(labcfg, ["labconfig","bridges",c,"bridge"])
- brcidr = getFromDict(labcfg, ["labconfig","bridges",c,"cidr"])
+while c < len(labcfg["opnfv"]["spaces"]):
+ brtype = getFromDict(labcfg, ["opnfv","spaces",c,"type"])
+ brname = getFromDict(labcfg, ["opnfv","spaces",c,"bridge"])
+ brcidr = getFromDict(labcfg, ["opnfv","spaces",c,"cidr"])
+#
if brtype == "admin":
- ethbrAdmin = getFromDict(labcfg, ["labconfig","bridges",c,"bridge"])
- brgway = getFromDict(labcfg, ["labconfig","bridges",c,"gateway"])
+ ethbrAdmin = getFromDict(labcfg, ["opnfv","spaces",c,"bridge"])
+ brgway = getFromDict(labcfg, ["opnfv","spaces",c,"gateway"])
tmpcidr = brcidr[:-4]
- setInDict(opnfvcfg, ["demo-maas", "maas", "ip_address"], tmpcidr+"5")
- opnfvcfg["demo-maas"]["maas"]["interfaces"][y] = "bridge="+brname+",model=virtio"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["device"] = "eth"+str(y)
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["ip"] = tmpcidr+"5"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["subnet_mask"] = "255.255.255.0"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["broadcast_ip"] = tmpcidr+"255"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["router_ip"] = brgway
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["static_range"]["low"] = tmpcidr+"50"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["static_range"]["high"] = tmpcidr+"80"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["dynamic_range"]["low"] = tmpcidr+"81"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["dynamic_range"]["high"] = tmpcidr+"250"
- opnfvcfg["demo-maas"]["juju-bootstrap"]["interfaces"][z] = "bridge="+brname+",model=virtio"
+ opnfvlabcfg["opnfv"]["admNetwork"]=tmpcidr+"2"
+ opnfvlabcfg["opnfv"]["admNetgway"]=brgway
+
+ nodegroup={"device": "eth"+str(y), "ip": tmpcidr+"5","subnet_mask": "255.255.255.0", \
+ "broadcast_ip": tmpcidr+"255", "router_ip": brgway,\
+ "static_range":{"high":tmpcidr+"80","low":tmpcidr+"50"},\
+ "dynamic_range":{"high":tmpcidr+"250","low":tmpcidr+"81"}}
+
ethbrAdm = ('auto lo\n'
' iface lo inet loopback\n\n'
'auto eth'+str(y)+'\n'
' netmask 255.255.255.0\n'
' gateway '+brgway+'\n'
' dns-nameservers '+updns+' '+tmpcidr+'5 127.0.0.1\n')
- z=z+1
+
+ opnfvcfg['demo-maas']['maas']['ip_address']=tmpcidr+"5"
+ opnfvcfg['demo-maas']['maas']['interfaces'].append("bridge="+brname+",model=virtio")
+ opnfvcfg['demo-maas']['juju-bootstrap']['interfaces'].append("bridge="+brname+",model=virtio")
+ opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"].append(nodegroup)
y=y+1
elif brtype:
opnfvcfg["demo-maas"]["maas"]["interfaces"].append("bridge="+brname+",model=virtio")
- brgway = getFromDict(labcfg, ["labconfig","bridges",c,"gateway"])
+ brgway = getFromDict(labcfg, ["opnfv","spaces",c,"gateway"])
if brtype != "external":
tmpcidr = brcidr[:-4]
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["device"] = "eth"+str(y)
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["ip"] = tmpcidr+"5"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["subnet_mask"] = "255.255.255.0"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["broadcast_ip"] = tmpcidr+"255"
if brgway:
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["router_ip"] = brgway
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["management"] = 1
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["static_range"]["low"] = tmpcidr+"20"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["static_range"]["high"] = tmpcidr+"150"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["dynamic_range"]["low"] = tmpcidr+"151"
- opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"][y]["dynamic_range"]["high"] = tmpcidr+"200"
+ nodegroup={"device": "eth"+str(y), "ip": tmpcidr+"5","subnet_mask": "255.255.255.0", \
+ "broadcast_ip": tmpcidr+"255", "management": 1, "router_ip": brgway,\
+ "static_range":{"high":tmpcidr+"80","low":tmpcidr+"50"},\
+ "dynamic_range":{"high":tmpcidr+"250","low":tmpcidr+"81"}}
+ else:
+ nodegroup={"device": "eth"+str(y), "ip": tmpcidr+"5","subnet_mask": "255.255.255.0", \
+ "broadcast_ip": tmpcidr+"255", "management": 1, \
+ "static_range":{"high":tmpcidr+"80","low":tmpcidr+"50"},\
+ "dynamic_range":{"high":tmpcidr+"250","low":tmpcidr+"81"}}
+ opnfvcfg["demo-maas"]["maas"]["node_group_ifaces"].append(nodegroup)
ethbrAdm = (ethbrAdm+'\n'
'auto eth'+str(y)+'\n'
' iface eth'+str(y)+' inet static\n'
' address '+tmpcidr+'5\n'
' netmask 255.255.255.0\n')
+ y=y+1
if brtype == "public":
opnfvcfg["demo-maas"]["juju-bootstrap"]["interfaces"].append("bridge="+brname+",model=virtio")
- z=z+1
+ opnfvlabcfg["opnfv"]["publicNetwork"]=brcidr
if brtype == "external":
- ipaddress = getFromDict(labcfg, ["labconfig","bridges",c,"ipaddress"])
+ ipaddress = getFromDict(labcfg, ["opnfv","spaces",c,"ipaddress"])
ethbrAdm = (ethbrAdm+'\n'
'auto eth'+str(y)+'\n'
' iface eth'+str(y)+' inet static\n'
' address '+ipaddress+'\n'
' netmask 255.255.255.0\n')
opnfvcfg["demo-maas"]["juju-bootstrap"]["interfaces"].append("bridge="+brname+",model=virtio")
- z=z+1
- y=y+1
-
+ if brtype == "data":
+ opnfvlabcfg["opnfv"]["dataNetwork"]=brcidr
+ if brtype == "storage":
+ opnfvlabcfg["opnfv"]["storageNetwork"]=brcidr
c=c+1
-setInDict(opnfvcfg, ["demo-maas", "maas", "network_config"], ethbrAdm)
-
# lets modify the maas general settings:
-value = get_ip_address(ethbrAdmin)
+value = get_ip_address(ethbrAdmin)
value = "qemu+ssh://"+getpass.getuser()+"@"+value+"/system"
-setInDict(opnfvcfg, ["demo-maas", "maas", "virsh", "uri"], value)
+opnfvcfg['demo-maas']['maas']['virsh']['uri']=value
+opnfvcfg['demo-maas']['maas']['network_config']=ethbrAdm
+
+if len(labcfg["lab"]["racks"][0]["nodes"]) < 1:
+ print("looks like virtual deployment where nodes were not defined")
+ opnfvcfg["demo-maas"]["maas"]["nodes"].remove()
+ exit()
#lets insert the node details here:
c=0
-
-while c < len(labcfg["labconfig"]["nodes"]):
+ifnamelist=[]
+#
+while c < len(labcfg["lab"]["racks"][0]["nodes"]):
+ valuemac=[]
+ y = 0
# setup value of name and tags accordigly
- value = getFromDict(labcfg, ["labconfig","nodes",c, "type"])
- namevalue = "node" + str(c+1) + "-" + value
- if c > 0:
- opnfvcfg["demo-maas"]["maas"]["nodes"].append({})
-
- opnfvcfg["demo-maas"]["maas"]["nodes"][c]["name"] = namevalue
- opnfvcfg["demo-maas"]["maas"]["nodes"][c]["tags"] = value
+ noderoleslist = labcfg["lab"]["racks"][0]["nodes"][c]["roles"]
+ noderoles = " ".join(noderoleslist)
+ valuetype = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "power", "type"])
+ namevalue = labcfg["lab"]["racks"][0]["nodes"][c]["name"]
+ valuearc = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "architecture"])
# setup value of architecture
- value = getFromDict(labcfg, ["labconfig","nodes",c, "architecture"])
- if value == "x86_64":
- value="amd64/generic"
- opnfvcfg["demo-maas"]["maas"]["nodes"][c]["architecture"] = value
-
- # setup mac_addresses
- value = getFromDict(labcfg, ["labconfig","nodes",c, "pxe_mac_address"])
- opnfvcfg["demo-maas"]["maas"]["nodes"][c]["mac_addresses"] = value
- valuetype = getFromDict(labcfg, ["labconfig","nodes",c, "power", "type"])
+ if valuearc == "x86_64":
+ valuearc="amd64/generic"
if valuetype == "wakeonlan":
- macvalue = getFromDict(labcfg, ["labconfig","nodes",c, "power", "mac_address"])
+ macvalue = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "power", "mac_address"])
power={"type": "ether_wake", "mac_address": macvalue}
- opnfvcfg["demo-maas"]["maas"]["nodes"][c]["power"] = power
if valuetype == "ipmi":
- valueaddr = getFromDict(labcfg, ["labconfig","nodes",c, "power", "address"])
- valueuser = getFromDict(labcfg, ["labconfig","nodes",c, "power", "user"])
- valuepass = getFromDict(labcfg, ["labconfig","nodes",c, "power", "pass"])
+ valueaddr = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "power", "address"])
+ valueuser = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "power", "user"])
+ valuepass = getFromDict(labcfg, ["lab","racks",0,"nodes",c, "power", "pass"])
valuedriver = "LAN_2_0"
- power={"type": valuetype, "address": valueaddr,"user": valueuser, "pass": valuepass, "driver": valuedriver}
- opnfvcfg["demo-maas"]["maas"]["nodes"][c]["power"] = power
+ power={"type": valuetype, "address": valueaddr,"user": valueuser,\
+ "pass": valuepass, "driver": valuedriver}
+
+ opnfvcfg["demo-maas"]["maas"]["nodes"].append({"name": namevalue, \
+ "architecture":valuearc,"interfaces":[],"mac_addresses":[],\
+ "power":power,'tags':noderoles})
+ y = 0
+ while y < len(labcfg["lab"]["racks"][0]["nodes"][c]["nics"]):
+ valuespaces = labcfg["lab"]["racks"][0]["nodes"][c]["nics"][y]["spaces"]
+ valueifname = labcfg["lab"]["racks"][0]["nodes"][c]["nics"][y]["ifname"]
+ if "admin" not in valuespaces:
+ ifnamelist += [valueifname]
+ valueifmac = labcfg["lab"]["racks"][0]["nodes"][c]["nics"][y]["mac"][0]
+ valuemac += labcfg["lab"]["racks"][0]["nodes"][c]["nics"][y]["mac"]
+ opnfvcfg["demo-maas"]["maas"]["nodes"][c]["interfaces"]\
+ .append({"name":valueifname,"mac_address":valueifmac,"mode": "auto"})
+ y=y+1
+
+ if valueifmac:
+ opnfvcfg["demo-maas"]["maas"]["nodes"][c]['mac_addresses']=valuemac
c=c+1
-with open('deployment.yaml', 'w') as opnfvf:
+opnfvlabcfg["opnfv"]["floating-ip-range"]=labcfg["lab"]["racks"][0]["floating-ip-range"]
+opnfvlabcfg["opnfv"]["ext-port"]=labcfg["lab"]["racks"][0]["ext-port"]
+opnfvlabcfg["opnfv"]["ceph-disk"]=labcfg["opnfv"]["storage"][0]["disk"]
+opnfvlabcfg["opnfv"]["interface-enable"]=",".join(list(set(ifnamelist)))
+
+with open('deployment.yaml', 'wa') as opnfvf:
yaml.dump(opnfvcfg, opnfvf, default_flow_style=False)
+with open('deployconfig.yaml', 'wa') as opnfvf:
+ yaml.dump(opnfvlabcfg, opnfvf, default_flow_style=False)
Code Review / joid.git / blobdiff