update readme, add demo jinja, stage1 of servmap

Change-Id: Ibf7ec8a9915b03bbf25cd3c86c23fe3056b4a42a
Issue-ID: TEST-152
Signed-off-by: DR695H <dr695h@att.com>

diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py
index 9a02a1b..a6af36d 100644 (file)
--- a/robot/assets/service_mappings.py
+++ b/robot/assets/service_mappings.py
@@ -5,124 +5,35 @@ import os.path
 '''
 This metadata identifies the folders to be zipped and uploaded to SDC for model distribution for a given VNF
 '''
-GLOBAL_SERVICE_FOLDER_MAPPING = {"vFW" : ['vFW'], \
-                                 "vLB" : ['vLBMS'], \
-                                 "vVG" : ['vVG'], \
-                                 "vCPE" : ['vCPE/infra', 'vCPE/vbng', 'vCPE/vbrgemu', 'vCPE/vgmux', 'vCPE/vgw'],
-                                 "vFWCL" : ['vFWCL/vFWSNK', 'vFWCL/vPKG'],
-                                 "vFWNG" : ['vFW_NextGen/templates'],
-                                 "vCPEInfra" : ['vCPE/infra'],
-                                 "vCPEvBNG" : ['vCPE/vbng'],
-                                 "vCPEvBRGEMU" : ['vCPE/vbrgemu'],
-                                 "vCPEvGMUX" : ['vCPE/vgmux'],
-                                 "vCPEvGW" : ['vCPE/vgw'],
-                                 "vCPEResCust" : ['vCPE/vgw'],
-                                 }
+GLOBAL_SERVICE_FOLDER_MAPPING = {}
 
 '''
 Map the service to the list of VNFs to be orchestrated
 '''
-GLOBAL_SERVICE_VNF_MAPPING = {
-    "vFW"  : ['vFW'],
-    "vLB"  : ['vLB'],
-    "vVG"  : ['vVG'],
-    "vCPE" : ['vCPE'],
-    "vFWCL"  : ['vFWCLvFWSNK', 'vFWCLvPKG'],
-    "vFWNG"  : ['vFWNG'],
-    "vCPEInfra" : ['vCPEInfra'],
-    "vCPEvBNG" : ['vCPEvBNG'],
-    "vCPEvBRGEMU" : ['vCPEvBRGEMU'],
-    "vCPEvGMUX" : ['vCPEvGMUX'],
-    "vCPEvGW" : ['vCPEvGW'],
-    "vCPERestCust" : ['vCPEvGW'],
-                                 }
+GLOBAL_SERVICE_VNF_MAPPING = {}
 
 '''
-
 Map the service to the list of Generic Neutron Networks to be orchestrated
-
-'''
-GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING = {
-    "vCPEInfra" : ['CPE_SIGNAL','CPE_PUBLIC'],
-    "vCPEvBNG" : ['BRG_BNG', 'BNG_MUX'],
-    "vCPEvGMUX" : ['MUX_GW'],
-    "vCPEvBRGEMU" :[],
-    "vCPEvGW" :[],
-    "vCPERestCust" :[],
-    "vFW" :[],
-    "vLB" :[],
-    "vVG" :[],
-    "vFWCL" :[],
-    "vFWNG" :[],
-}
 '''
-
-Map the service to the list of Deployment Artifacts for Closed Loop Control
+GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING = {}
 
 '''
-GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING = {
-    "vCPEInfra" : [],
-    "vCPEvBNG" : [],
-    "vCPEvGMUX" : [],
-    "vCPEvBRGEMU" :[],
-    "vCPEvGW" :[],
-    "vCPERestCust" :[],
-    "vFW" :[],
-    "vLB" :['tca_docker_k8s_v4.yaml'],
-    "vVG" :[],
-    "vFWCL" :[],
-    "vFWNG" :[],
-}
+Map the service to the list of Deployment Artifacts for Closed Loop Control
 '''
+GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING = {}
 
-
-
+'''
 This metadata identifes the preloads that need to be done for a VNF as there may be more than one (vLB)
 "template" maps to the parameters in the preload_paramenters.py
   - GLOBAL_PRELOAD_PARAMETERS[<testcase>][<template>] -
     i.e. GLOBAL_PRELOAD_PARAMETERS['Demo'][dnsscaling_preload.template']
 '''
-GLOBAL_SERVICE_TEMPLATE_MAPPING = {
-        "vFW"  : [{"isBase" : "true", "template" : "vfw_preload.template", "vnf_index": "0", "name_pattern": "base_vfw"}],
-    "vLB"  : [{"isBase" : "true",   "template" : "vlb_preload.template", "vnf_index": "0", "name_pattern": "base_vlb"},
-              {"isBase" : "false",  "template" : "dnsscaling_preload.template", "vnf_index": "1", "name_pattern": "dnsscaling", "prefix" : "vDNS_"}],
-    "vVG"  : [{"isBase" : "true",   "template" : "vvg_preload.template", "vnf_index": "0", "name_pattern": "base_vvg"}],
-    "vCPE" : [{"isBase" : "true",  "template" : "vcpe_preload.template", "vnf_index": "0", "name_pattern": "base_clearwater"}],
-    "vFWSNK" : [{"isBase" : "true",   "template" : "vfwsnk_preload.template", "vnf_index": "0", "name_pattern": "base_vfw"}],
-    "vPKG"   : [{"isBase" : "true",  "template" : "vpkg_preload.template", "vnf_index": "0", "name_pattern": "base_vpkg"}],
-    "vFWCL"   : [{"isBase" : "true",   "template" : "vfwsnk_preload.template", "vnf_index": "0", "name_pattern": "base_vfw"},
-                 {"isBase" : "true",  "template" : "vpkg_preload.template", "vnf_index": "1", "name_pattern": "base_vpkg"}],
-    "vFWCLvFWSNK"   : [{"isBase" : "true",   "template" : "vfwsnk_preload.template", "vnf_index": "0", "name_pattern": "base_vfw"}],
-    "vFWCLvPKG"   : [{"isBase" : "true",  "template" : "vpkg_preload.template", "vnf_index": "1" , "name_pattern": "base_vpkg"}],
-    "vCPEInfra" : [{"isBase" : "true",  "template" : "vcpe_infra_preload.template", "vnf_index": "0", "name_pattern": "base_infra"}],
-    "vCPEvBNG" : [{"isBase" : "true",  "template" : "vcpe_vbng_preload.template", "vnf_index": "0", "name_pattern": "base_vbng"}],
-    "vCPEvBRGEMU" : [{"isBase" : "true",  "template" : "vcpe_vbrgemu_preload.template", "vnf_index": "0", "name_pattern": "base_vbrgemu"}],
-    "vCPEvGMUX" : [{"isBase" : "true",  "template" : "vcpe_vgmux_preload.template", "vnf_index": "0", "name_pattern": "base_vgmux"}],
-    "vCPEvGW" : [{"isBase" : "true",  "template" : "vcpe_vgw_preload.template", "vnf_index": "0", "name_pattern": "base_vgw"}],
-    "vCPEResCust" : [{"isBase" : "true",  "template" : "vcpe_vgw_preload.template", "vnf_index": "0", "name_pattern": "base_vgw"}],
-}
+GLOBAL_SERVICE_TEMPLATE_MAPPING = {}
 
 '''
 Used by the Heatbridge Validate Query to A&AI to locate the vserver name
 '''
-GLOBAL_VALIDATE_NAME_MAPPING = {"vFW" : 'vfw_name_0',
-                                 "vLB" : 'vlb_name_0',
-                                 "vVG" : '',
-                                 "vCPE" : 'vgw_name_0',
-                                 "vCPEvGW" : 'vgw_name_0',
-                                 "vCPEResCust" : 'vgw_name_0',
-                                 "vCPEvDNS" : 'vdns_name_0',
-                                 "vCPEvAAA" : 'vaaa_name_0',
-                                 "vCPEvWEB" : 'vweb_name_0',
-                                 "vCPEvDHCP" : 'vdhcp_name_0',
-                                 "vCPEvGMUX" : 'vgmux_name_0',
-                                 "vFWSNK" : 'vfw_name_0',
-                                 "vPKG" : 'vpg_name_0',
-                                 "vFWCLvFWSNK" : 'vfw_name_0',
-                                 "vFWCLvPKG" : 'vpg_name_0',
-                                 }
-
-
+GLOBAL_VALIDATE_NAME_MAPPING = {}
 
 # Create dictionaries for new MAPPING data to join to original MAPPING data
 GLOBAL_SERVICE_FOLDER_MAPPING2 = {}

diff --git a/robot/assets/templates/aai/customer.jinja b/robot/assets/templates/aai/customer.jinja
new file mode 100644 (file)
index 0000000..831bac2
--- /dev/null
+++ b/robot/assets/templates/aai/customer.jinja
@@ -0,0 +1,26 @@
+{
+        "global-customer-id": "{{global_customer_id}}",
+        "subscriber-name": "{{subscriber_name}}",
+        "subscriber-type": "{{subscriber_type}}",
+        {% if service1 %}
+            "service-subscriptions": {
+                    "service-subscription": [{
+                            "service-type": "{{service1}}",
+                            "relationship-list": {
+                                    "relationship": [{
+                                            "related-to": "tenant",
+                                            "relationship-data": [
+                                                {%- for relationship in relationships -%}
+                                                    {% if not loop.first %},{% endif %}
+                                                    {
+                                                             "relationship-key": "{{relationship.0}}",
+                                                             "relationship-value": "{{relationship.1}}"
+                                                    }
+                                                {%- endfor %}
+                                            ]
+                                    }]
+                            }
+                    }]
+            }
+        {% endif %}
+}
\ No newline at end of file