modfied to fix it for onos.

[joid.git] / ci / deploy.py

diff --git a/ci/deploy.py b/ci/deploy.py
index cfd744d..99dce0d 100644 (file)
--- a/ci/deploy.py
+++ b/ci/deploy.py
@@ -18,6 +18,7 @@ with open('labconfig.yaml', 'r') as labf:
     labcfg = yaml.load(labf)
 
 opnfvcfg={}
+opnfvlabcfg={}
 
 def getFromDict(dataDict, mapList):
     return reduce(lambda d, k: d[k], mapList, dataDict)
@@ -52,9 +53,11 @@ opnfvcfg['demo-maas']={'juju-bootstrap':{'memory': 4096,'name': "bootstrap",\
                               }\
                       }
 
+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") 
+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:
 
@@ -84,6 +87,8 @@ while c < len(labcfg["opnfv"]["spaces"]):
         ethbrAdmin = getFromDict(labcfg, ["opnfv","spaces",c,"bridge"])
         brgway = getFromDict(labcfg, ["opnfv","spaces",c,"gateway"])
         tmpcidr = brcidr[:-4]
+        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,\
@@ -128,6 +133,7 @@ while c < len(labcfg["opnfv"]["spaces"]):
             y=y+1
         if brtype == "public":
             opnfvcfg["demo-maas"]["juju-bootstrap"]["interfaces"].append("bridge="+brname+",model=virtio")
+            opnfvlabcfg["opnfv"]["publicNetwork"]=brcidr
         if brtype == "external":
             ipaddress = getFromDict(labcfg, ["opnfv","spaces",c,"ipaddress"])
             ethbrAdm  = (ethbrAdm+'\n'
@@ -136,6 +142,10 @@ while c < len(labcfg["opnfv"]["spaces"]):
                         '    address '+ipaddress+'\n'
                         '    netmask 255.255.255.0\n')
             opnfvcfg["demo-maas"]["juju-bootstrap"]["interfaces"].append("bridge="+brname+",model=virtio")
+        if brtype == "data":
+            opnfvlabcfg["opnfv"]["dataNetwork"]=brcidr
+        if brtype == "storage":
+            opnfvlabcfg["opnfv"]["storageNetwork"]=brcidr
 
     c=c+1
 
@@ -152,6 +162,7 @@ if len(labcfg["lab"]["racks"][0]["nodes"]) < 1:
 
 #lets insert the node details here:
 c=0
+ifnamelist=[]
 #
 while c < len(labcfg["lab"]["racks"][0]["nodes"]):
     valuemac=[]
@@ -183,7 +194,10 @@ while c < len(labcfg["lab"]["racks"][0]["nodes"]):
              "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"]\
@@ -196,6 +210,13 @@ while c < len(labcfg["lab"]["racks"][0]["nodes"]):
 
     c=c+1
 
+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)