Fix issues with vLB use case

Change-Id: Iaf380c8697e813295e6e51367df1aefbfef695ce
Issue-ID: INT-658
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/heat/vLB_CDS/base_template.env b/heat/vLB_CDS/base_template.env
index 0e396e0..38c4e82 100644 (file)
--- a/heat/vLB_CDS/base_template.env
+++ b/heat/vLB_CDS/base_template.env
@@ -3,12 +3,12 @@ parameters:
   # NETWORK_ROLE: private
   vlb_private_net_id: zdfw1lb01_private
   vlb_private_net_cidr: 192.168.10.0/24
-  vlb_0_int_pktgen_private_port_0_mac: fa:16:3e:00:10
+  vlb_0_int_pktgen_private_port_0_mac: fa:16:3e:00:01:10
 
   # NETWORK_ROLE: pktgen_private
   pktgen_private_net_id: zdfw1pktgen01_private
   pktgen_private_net_cidr: 192.168.9.0/24
-  vpg_0_int_pktgen_private_port_0_mac: fa:16:3e:00:20
+  vpg_0_int_pktgen_private_port_0_mac: fa:16:3e:00:01:20
 
   # METADATA
   vnf_name: vLBMS

diff --git a/heat/vLB_CDS/vlb.env b/heat/vLB_CDS/vlb.env
index 95dfa85..248e831 100644 (file)
--- a/heat/vLB_CDS/vlb.env
+++ b/heat/vLB_CDS/vlb.env
@@ -12,8 +12,8 @@ parameters:
   vpg_onap_private_ip_0: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VPKTGEN
   vdns_int_private_ip_0: 192.168.10.211
   vdns_onap_private_ip_0: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VDNS
-  vlb_0_mac_address: 00:00:00:00:00
-  vpg_0_mac_address: 00:00:00:00:00
+  vlb_0_mac_address: fa:16:3e:00:01:10
+  vpg_0_mac_address: fa:16:3e:00:01:20
   keypair: vlb_key
 
   # NETWORK_ROLE: onap_private

diff --git a/heat/vLB_CDS/vpkg.env b/heat/vLB_CDS/vpkg.env
index 5a56915..0c9a7c1 100644 (file)
--- a/heat/vLB_CDS/vpkg.env
+++ b/heat/vLB_CDS/vpkg.env
@@ -6,8 +6,8 @@ parameters:
   vpg_int_pktgen_private_ip_0: 192.168.9.110
   vpg_onap_private_ip_0: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VPKTGEN
   vlb_int_pktgen_private_ip_0: 192.168.9.111
-  vlb_0_mac_address: 00:00:00:00:00
-  vpg_0_mac_address: 00:00:00:00:00
+  vlb_0_mac_address: fa:16:3e:00:01:10
+  vpg_0_mac_address: fa:16:3e:00:01:20
   keypair: vlb_key
 
   # NETWORK_ROLE: onap_private

diff --git a/service_mapping/vLB/service_mapping.json b/service_mapping/vLB/service_mapping.json
index c957426..8f23aa8 100644 (file)
--- a/service_mapping/vLB/service_mapping.json
+++ b/service_mapping/vLB/service_mapping.json
@@ -9,13 +9,14 @@
         "vLB" :[]
    },
    "GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING": {
-    "vLB" :["tca_docker_k8s_v4.yaml"]
+    "vLB" :["k8s-tca-clamp-policy-05082019.yaml"]
    },
    "GLOBAL_SERVICE_TEMPLATE_MAPPING":  {
     "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_"}]
    },
    "GLOBAL_VALIDATE_NAME_MAPPING": {
-                                 "vLB" : "vlb_name_0"
+                                 "vLB" : "vlb_name_0",
+                                 "vDNS" : "vdns_name_0"
    } 
 }