1 files changed, 32 insertions, 34 deletions

diff --git a/process_conf.py b/process_conf.py
index a28f809..c8f4e9d 100644
--- a/process_conf.py
+++ b/process_conf.py
@@ -14,31 +14,27 @@ def load_file(file):
             return None
 
 
-def generate_vm_conf(vm_config, scripts_dir):
-    """generate opera/work/scripts_dir/openo-vm.conf"""
-    print vm_config["openo"]["cpu"]
-    with open(scripts_dir + "/openo-vm.conf", "w") as fd:
-        fd.write("OPENO_TAG=" + str(vm_config["openo"]["tag"]) + "\n")
-        fd.write("OPENO_VIRT_CPUS=" + str(vm_config["openo"]["cpu"]) + "\n")
-        fd.write("OPENO_VIRT_MEM=" + str(vm_config["openo"]["memory"]) + "\n")
-        fd.write("OPENO_VIRT_DISK=" + str(vm_config["openo"]["disk"]) + "\n")
-        fd.write("OPENO_VM_NET=" + vm_config["openo"]["vnet"] + "\n")
+def generate_openo_conf(openo_config, scripts_dir):
+    """generate opera/work/scripts_dir/open-o.conf"""
+    with open(scripts_dir + "/open-o.conf", "w") as fd:
+        for i in openo_config["openo_net"].keys():
+            fd.write('{0}={1}\n'.format(i.upper(), openo_config["openo_net"][i]))
 
+        for i in openo_config["openo_docker_net"]:
+            fd.write('{0}={1}\n'.format(i.upper(), openo_config["openo_docker_net"][i]))
 
-def generate_net_conf(net_config, scripts_dir):
-    """generate opera/work/scripts_dir/network.conf"""
-    with open(scripts_dir + "/network.conf", "w") as fd:
-        for i in net_config["openo_net"].keys():
-            fd.write(i.upper() + "=" + net_config["openo_net"][i])
-            fd.write("\n")
+        fd.write('{0}={1}\n'.format('OPENO_VERSION', openo_config["openo_version"]))
 
-        for i in net_config["openo_docker_net"].keys():
-            fd.write(i.upper() + "=" + net_config["openo_docker_net"][i])
-            fd.write("\n")
 
-        for i in net_config["juju_net"].keys():
-            fd.write(i.upper() + "=" + net_config["juju_net"][i])
-            fd.write("\n")
+def generate_app_conf(openo_config, app_config, scripts_dir):
+    """generate opera/work/scripts_dir/application.conf"""
+    with open(scripts_dir + "/application.conf", "w") as fd:
+        for i in app_config["application"]:
+            if i["name"] == openo_config["application"]:
+                fd.write('{0}={1}\n'.format('APP_NAME', i["name"]))
+                fd.write('{0}={1}\n'.format('APP_NS_PKG', i["ns_pkg"]))
+                fd.write('{0}={1}'.format('APP_VNF_PKG', i["vnf_pkg"]))
+            break
 
 
 if __name__ == "__main__":
@@ -46,22 +42,24 @@ if __name__ == "__main__":
         print("parameter wrong%d %s" % (len(sys.argv), sys.argv))
         sys.exit(1)
 
-    _, vm_file, net_file = sys.argv
+    _, openo_file, app_file = sys.argv
 
-    if not os.path.exists(vm_file):
-        print("openo-vm.yml doesn't exit")
-        sys.exit(1)
-    if not os.path.exists(net_file):
+    if not os.path.exists(openo_file):
         print("network.yml doesn't exit")
         sys.exit(1)
 
-    vm_config = load_file(vm_file)
-    net_config = load_file(net_file)
-    if not vm_config:
-        print('format error in %s' % vm_file)
+    if not os.path.exists(app_file):
+        print("application.yml doesn't exit")
+        sys.exit(1)
+
+    openo_config = load_file(openo_file)
+    if not openo_config:
+        print('format error in %s' % openo_file)
         sys.exit(1)
-    if not net_config:
-        print('format error in %s' % net_file)
+
+    app_config = load_file(app_file)
+    if not app_config:
+        print('format error in %s' % app_file)
         sys.exit(1)
 
     opera_dir = os.getenv('OPERA_DIR')
@@ -70,5 +68,5 @@ if __name__ == "__main__":
         print("dir opera/work/scripts doesn't exit")
         sys.exit(1)
 
-    generate_vm_conf(vm_config, scripts_dir)
-    generate_net_conf(net_config, scripts_dir)
+    generate_openo_conf(openo_config, scripts_dir)
+    generate_app_conf(openo_config, app_config, scripts_dir)