X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2FgenBundle.py;h=de0f879ed2930344d6884c62c591956817cb2dfd;hb=149e7053b83b2236eac66701837c0d183bb25b81;hp=cb61f5aa14d567a848b9d157ed7508153736a182;hpb=1f67ee4bac259f5997ee570eec3060f24e05d56f;p=joid.git

diff --git a/ci/genBundle.py b/ci/genBundle.py
index cb61f5aa..de0f879e 100644
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -1,74 +1,110 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+"""
+This script generates a juju deployer bundle based on
+scenario name, and lab config file.
+
+Parameters:
+ -s, --scenario : scenario name
+ -l, --lab      : lab config file
+"""
+
 from optparse import OptionParser
 from jinja2 import Environment, FileSystemLoader
-from pprint import pprint as pp
+from distutils.version import LooseVersion, StrictVersion
 import os
+import subprocess
 import random
 import yaml
-import sys, traceback
+import sys
 
-##
-## Parse parameters
-##
+#
+# Parse parameters
+#
 
 parser = OptionParser()
-parser.add_option("-s", "--scenario", dest="scenario", help ="scenario name")
-parser.add_option("-l", "--lab", dest="lab", help ="lab config file")
+parser.add_option("-s", "--scenario", dest="scenario", help="scenario name")
+parser.add_option("-l", "--lab", dest="lab", help="lab config file")
 (options, args) = parser.parse_args()
 scenario = options.scenario
 labconfig_file = options.lab
 
-##
-## Set Path and configs path
-##
+#
+# Set Path and configs path
+#
 
 scenarioconfig_file = 'default_deployment_config.yaml'
-# Capture our current directory
-TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/bundle_tpl'
+TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/juju2/bundle_tpl'
 
-##
-## Prepare variables
-##
+#
+# Prepare variables
+#
 
 # Prepare a storage for passwords
 passwords_store = dict()
 
-##
-## Local Functions
-##
+#
+# Local Functions
+#
+
 
 def load_yaml(filepath):
+    """Load YAML file"""
     with open(filepath, 'r') as stream:
         try:
             return yaml.load(stream)
         except yaml.YAMLError as exc:
             print(exc)
 
-##
-## Templates functions
-##
+#
+# Templates functions
+#
+
 
 def unit_qty():
+    """Return quantity of units to deploy"""
     global config
     if config['os']['ha']['mode'] == 'ha':
         return config['os']['ha']['cluster_size']
     else:
         return 1
 
-def to_select( qty = False ):
+
+def unit_ceph_qty():
+    """Return size of the ceph cluster"""
+    global config
+    if config['os']['ha']['mode'] == 'ha':
+        return config['os']['ha']['cluster_size']
+    else:
+        if config['opnfv']['units'] >= 3:
+            return config['os']['ha']['cluster_size']
+        else:
+            return 2
+
+def unit_scaleio_qty():
+    """Return size of the scaleio cluster"""
+    return 3
+
+def to_select(qty=False):
+    """Return a random list of machines numbers to deploy"""
     global config
     if not qty:
-        qty = config['os']['ha']['cluster_size'] if config['os']['ha']['mode'] == 'ha' else 1
-    return random.sample(range(0,config['opnfv']['units']), qty )
+        qty = config['os']['ha']['cluster_size'] if \
+                config['os']['ha']['mode'] == 'ha' else 1
+    if config['os']['hyperconverged']:
+        return random.sample(range(0, config['opnfv']['units']), qty)
+    else:
+        return random.sample(range(0, qty), qty)
+
 
 def get_password(key, length=16, special=False):
+    """Return a new random password or a already created one"""
     global passwords_store
     if key not in passwords_store.keys():
         alphabet = "abcdefghijklmnopqrstuvwxyz"
         upperalphabet = alphabet.upper()
-        char_list = alphabet + upperalphabet
+        char_list = alphabet + upperalphabet + '0123456789'
         pwlist = []
         if special:
             char_list += "+-,;./:?!*"
@@ -78,16 +114,16 @@ def get_password(key, length=16, special=False):
         passwords_store[key] = "".join(pwlist)
     return passwords_store[key]
 
-##
-## Config import
-##
+#
+# Config import
+#
 
-#Load scenario Config
+# Load scenario Config
 config = load_yaml(scenarioconfig_file)
-#Load lab Config
+# Load lab Config
 config.update(load_yaml(labconfig_file))
 
-#We transform array to hash for an easier work
+# We transform array to hash for an easier work
 config['opnfv']['spaces_dict'] = dict()
 for space in config['opnfv']['spaces']:
     config['opnfv']['spaces_dict'][space['type']] = space
@@ -95,13 +131,13 @@ config['opnfv']['storage_dict'] = dict()
 for storage in config['opnfv']['storage']:
     config['opnfv']['storage_dict'][storage['type']] = storage
 
-##
-## Parse scenario name
-##
+#
+# Parse scenario name
+#
 
 # Set default scenario name
 if not scenario:
-    scenario = "os-nosdn-nofeature-nonha"
+    scenario = "os-nosdn-nofeature-noha"
 
 # Parse scenario name
 try:
@@ -117,9 +153,9 @@ except ValueError as err:
           '"os-<controller>-<nfvfeature>-<mode>[-<extrastuff>]" format')
     sys.exit(1)
 
-##
-## Update config with scenario name
-##
+#
+# Update config with scenario name
+#
 
 # change ha mode
 config['os']['ha']['mode'] = hamode
@@ -127,6 +163,9 @@ config['os']['ha']['mode'] = hamode
 # change ha mode
 config['os']['network']['controller'] = sdn
 
+if 'ocl' in sdn:
+    config['os']['hyperconverged'] = False
+
 # Change features
 if 'lxd' in features:
     config['os']['lxd'] = True
@@ -136,20 +175,49 @@ if 'ipv6' in features:
     config['os']['network']['ipv6'] = True
 if 'ovs' in features:
     config['os']['network']['enhanced_ovs'] = True
+if 'sfc' in features:
+    config['os']['network']['sfc'] = True
+if 'dpdk' in features:
+    config['os']['network']['dpdk'] = True
+    config['os']['beta']['huge_pages'] = True
+    config['os']['beta']['cpu_pin'] = True
+if 'bgpvpn' in features:
+    config['os']['network']['bgpvpn'] = True
+if 'odll3' in features:
+    config['os']['network']['odll3'] = True
+if 'dishypcon' in features:
+    config['os']['hyperconverged'] = False
+if 'hugepages' in features:
+    config['os']['beta']['huge_pages'] = True
+    config['os']['beta']['cpu_pin'] = True
+if 'openbaton' in features:
+    config['os']['service']['openbaton'] = True
+
 
 # Set beta option from extra
-if 'publicapi' in extra:
-    config['os']['beta']['public_api'] = True
 if 'radosgwcluster' in extra:
     config['os']['beta']['hacluster_ceph_radosgw'] = True
 if 'hugepages' in extra:
     config['os']['beta']['huge_pages'] = True
-
-# pp(config)
-
-##
-## Transform template to bundle.yaml according to config
-##
+    config['os']['beta']['cpu_pin'] = True
+if 'ocata' in extra:
+    config['os']['release'] = 'ocata'
+if 'pike' in extra:
+    config['os']['release'] = 'pike'
+if 'trusty' in extra:
+    config['ubuntu']['release'] = 'trusty'
+    if 'ocata' in extra:
+        config['os']['release'] = 'mitaka'
+if 'xenial' in extra:
+    config['ubuntu']['release'] = 'xenial'
+if 'dishypcon' in extra:
+    config['os']['hyperconverged'] = False
+if 'openbaton' in features:
+    config['os']['service']['openbaton'] = True
+
+#
+# Transform template to bundle.yaml according to config
+#
 
 # Create the jinja2 environment.
 env = Environment(loader=FileSystemLoader(TPL_DIR),
@@ -159,7 +227,18 @@ template = env.get_template('bundle.yaml')
 # Add functions
 env.globals.update(get_password=get_password)
 env.globals.update(unit_qty=unit_qty)
+env.globals.update(unit_ceph_qty=unit_ceph_qty)
+env.globals.update(unit_scaleio_qty=unit_scaleio_qty)
 env.globals.update(to_select=to_select)
 
 # Render the template
-print(template.render(**config))
+output = template.render(**config)
+
+# Check output syntax
+try:
+    yaml.load(output)
+except yaml.YAMLError as exc:
+    print(exc)
+
+# print output
+print(output)