move rest of stirngtemplating off old format

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

9 files changed, 19 insertions, 31 deletions

diff --git a/robot/resources/aai/service_instance.robot b/robot/resources/aai/service_instance.robot
index 5a4c4573..fa238ce5 100644
--- a/robot/resources/aai/service_instance.robot
+++ b/robot/resources/aai/service_instance.robot
@@ -9,7 +9,6 @@ Library    OperatingSystem
 Library    RequestsLibrary
 Library    ONAPLibrary.JSON
 Library    ONAPLibrary.Templating
-Library    StringTemplater
 Resource          ../stack_validation/validate_vlb.robot
 Resource          ../stack_validation/validate_vfw.robot
 Resource          ../stack_validation/validate_vvg.robot
diff --git a/robot/resources/appc_interface.robot b/robot/resources/appc_interface.robot
index f74ee1de..7aed6e1c 100644
--- a/robot/resources/appc_interface.robot
+++ b/robot/resources/appc_interface.robot
@@ -2,17 +2,15 @@
 Documentation     The main interface for interacting with APP-C. It handles low level stuff like managing the http request library and APP-C required fields
 Library 	      RequestsLibrary
 Library	          ONAPLibrary.Utilities
-Library           OperatingSystem
+Library	          ONAPLibrary.Templating
 Library           SeleniumLibrary
-Library           StringTemplater
-Resource          global_properties.robot
 Resource          browser_setup.robot
 
 *** Variables ***
 ${APPC_INDEX_PATH}    /restconf
 ${APPC_HEALTHCHECK_OPERATION_PATH}  /operations/SLI-API:healthcheck
 ${APPC_CREATE_MOUNTPOINT_PATH}  /config/network-topology:network-topology/topology/topology-netconf/node/
-${APPC_MOUNT_XML}    robot/assets/templates/appc/vnf_mount.template
+${APPC_MOUNT_XML}    appc/vnf_mount.jinja
 ${APPC_ENDPOINT}    ${GLOBAL_APPC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_APPC_IP_ADDR}:${GLOBAL_APPC_SERVER_PORT}
 ${APPC_CDT_Config_Scaleout}    ${EXECDIR}/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml
 ${APPC_CDT_Config_Scaleout_PD}    ${EXECDIR}/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml
@@ -57,8 +55,8 @@ Create Mount Point In APPC
     [Documentation]     Go tell APPC about the PGN we just spun up...
     [Arguments]    ${nodeid}    ${host}    ${port}=${GLOBAL_PGN_PORT}    ${username}=admin    ${password}=admin
     ${dict}=    Create Dictionary    nodeid=${nodeid}    host=${host}    port=${port}    username=${username}    password=${password}
-    ${template}=    OperatingSystem.Get File    ${APPC_MOUNT_XML}
-    ${data}=    Template String    ${template}    ${dict}
+    Create Environment    appc    ${GLOBAL_TEMPLATE_FOLDER}
+    ${data}=   Apply Template    appc   ${APPC_MOUNT_XML}    ${dict}
     ${resp}=    Run APPC Put Request     ${APPC_INDEX PATH}${APPC_CREATE_MOUNTPOINT_PATH}${nodeid}     ${data}
     Should Be True	200    <= ${resp.status_code} < 300
     [Return]     ${resp}
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 80ecc35f..fe33e07c 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -7,7 +7,6 @@ Library           OperatingSystem
 Library           Collections
 Library           SeleniumLibrary
 Library           String
-Library           StringTemplater
 Library           ArchiveLibrary
 Library           ONAPLibrary.Openstack
 Library           DateTime
diff --git a/robot/resources/heatbridge.robot b/robot/resources/heatbridge.robot
index 90725177..f91f9c4e 100644
--- a/robot/resources/heatbridge.robot
+++ b/robot/resources/heatbridge.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Library     HeatBridge
 Library     Collections
-Library     StringTemplater
 Library     OperatingSystem
 Library     ONAPLibrary.ServiceMapping
 Library     ONAPLibrary.Templating
@@ -73,8 +72,7 @@ Run Create VNFC
     Return From Keyword If   '${resp.status_code}' != '200'
     ${info}=   Set Variable   ${resp.json()}
     ${keys}=    Create Dictionary
-    Set To Dictionary   ${keys}   vserver_name=${info['server']['name']}
-    ${vnfc_name}=   Template String    ${VSERVER_NAME}    ${keys}
+    ${vnfc_name}=   Catenate    \    ${info['server']['name']}
     ${vnfc_nc}=    Set Variable  ${service}
     ${vnfc_func}=    Set Variable  ${service}
     Create VNFC If Not Exists    ${vnfc_name}     ${vnfc_nc}     ${vnfc_func}
diff --git a/robot/resources/portal-sdk/portalDef.robot b/robot/resources/portal-sdk/portalDef.robot
index 3cd2a6f4..b6f8e577 100644
--- a/robot/resources/portal-sdk/portalDef.robot
+++ b/robot/resources/portal-sdk/portalDef.robot
@@ -5,7 +5,6 @@ Library		OperatingSystem
 Library		RequestsLibrary
 Library		DateTime
 Library		Collections
-Library		StringTemplater
 Library		String
 Library     ONAPLibrary.Templating    
 
diff --git a/robot/resources/sdngc_interface.robot b/robot/resources/sdngc_interface.robot
index 988fe4c9..f36e08e0 100644
--- a/robot/resources/sdngc_interface.robot
+++ b/robot/resources/sdngc_interface.robot
@@ -5,7 +5,6 @@ Library	          ONAPLibrary.Utilities
 Library 	    SeleniumLibrary
 Library         Collections
 Library      String
-Library      StringTemplater
 Library           ONAPLibrary.ServiceMapping
 Library           ONAPLibrary.Templating
 Resource          global_properties.robot
diff --git a/robot/resources/stack_validation/packet_generator_interface.robot b/robot/resources/stack_validation/packet_generator_interface.robot
index 5482aaa3..85b997d2 100644
--- a/robot/resources/stack_validation/packet_generator_interface.robot
+++ b/robot/resources/stack_validation/packet_generator_interface.robot
@@ -1,7 +1,6 @@
 *** Settings ***
 Documentation     The main interface for interacting with A&AI. It handles low level stuff like managing the http request library and A&AI required fields
 Library 	      RequestsLibrary
-Library           StringTemplater
 Library	          ONAPLibrary.Utilities
 Library	          ONAPLibrary.Templating    
 Library	          OperatingSystem
@@ -19,7 +18,7 @@ ${PGN_ENABLE_STREAMS_V2_TEMPLATE}    vfw/vfw_pg_streams_v2.jinja
 Connect To Packet Generator
     [Documentation]    Enables packet generator for the passed stream on the passed host
     [Arguments]    ${host}    ${alias}=pgn
-    ${map}=  Create Dictionary     host=${host}    port=${GLOBAL_PACKET_GENERATOR_PORT}    path=${PGN_PATH}
+    ${map}=  Create Dictionary     host=${host}    port=${GLOBAL_PACKET_GENERATOR_PORT}
     ${url}=    Template String    ${PGN_URL_TEMPLATE}    ${map}
     ${auth}=  Create List     ${GLOBAL_PACKET_GENERATOR_USERNAME}    ${GLOBAL_PACKET_GENERATOR_PASSWORD}
     ${session}=    Create Session 	${alias} 	${url}    auth=${auth}
diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
index f11715e3..952882d2 100644
--- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
@@ -21,22 +21,21 @@ Resource    	../global_properties.robot
 Resource    	../so_interface.robot
 
 Library         ONAPLibrary.Openstack
-Library	          ONAPLibrary.Utilities
+Library	        ONAPLibrary.Utilities
+Library	        ONAPLibrary.Templating
 Library	        Collections
 Library         String
 Library         ONAPLibrary.JSON
 
 Library         RequestsLibrary
-Library    OperatingSystem
-Library    StringTemplater
-Library    Collections
+Library         Collections
 
 *** Variables ***
 ${service_template}    robot/assets/cds/service-Vfirewall0911-template.yml
 ${env}      robot/assets/cds/env.yml
-${so_request_template}    robot/assets/templates/cds/so_request.template    
-${vnf_template_name} 	robot/assets/templates/cds/vnf.template
-${vfmodule_template_name} 	robot/assets/templates/cds/vfmodule.template
+${so_request_template}    so/cds_request.jinja    
+${vnf_template_name} 	so/cds_vnf.jinja
+${vfmodule_template_name} 	so/cds_vfmodule.jinja
 ${so_uri_path}		/onap/so/infra/serviceInstantiation/v7/serviceInstances
 *** Variables ***
 
@@ -87,6 +86,7 @@ Orchestrate VNF With CDS
     ${list}=   	Create List
     ${vnfs}=   Get From Dictionary    ${jsondata['topology_template']}   node_templates
     ${keys}=   Get Dictionary Keys    ${vnfs}
+    Create Environment    cds    ${GLOBAL_TEMPLATE_FOLDER}
     :FOR   ${key}  IN  @{keys}
     \	 ${vnf}=   Get From Dictionary	  ${vnfs}   ${key}
     \    Get VNF Info	${key} 	${vnf}	${dict}
@@ -95,13 +95,11 @@ Orchestrate VNF With CDS
     \    ${value}= 	Convert To Lowercase 	${value}
     \    ${vfmodules}=	Get VFModule Info	 ${jsondata}	${value}	  ${dict}
     \	 Set To Dictionary	${dict}	  vf_modules=${vfmodules}
-    \	 ${vnf_template}= 	OperatingSystem.Get File    ${vnf_template_name}
-    \    ${vnf_payload}= 	Template String		${vnf_template}		${dict}
+    \    ${vnf_payload}=   Apply Template    cds		${vnf_template_name}		${dict}
     \	 ${data}= 	Catenate	[${vnf_payload}]
    
     Set To Dictionary 		${dict}		vnfs=${data}
-    ${resp}=    OperatingSystem.Get File    ${so_request_template}
-    ${request}=     Template String    ${resp}    ${dict}
+    ${request}=     Apply Template    cds    ${so_request_template}    ${dict}
     Log To Console     --------request--------
     Log to console     ${request}
     Log To Console     --------end request--------
@@ -134,12 +132,12 @@ Get VFModule Info
     ${keys}=   Get Dictionary Keys    ${vfModules}
     ${data}=   Catenate
     ${delim}=   Catenate
+    Create Environment    cds    ${GLOBAL_TEMPLATE_FOLDER}
     :FOR   ${key}  IN  @{keys}
     \    ${module}=   Get From Dictionary    ${vfModules}   ${key}
     \    Log to console 	${vnf} ${key}
     \    Run keyword if 	"${vnf}" in "${key}"	set vfmodule param	${key}	  ${module}	${dict}
-    \	 ${vfmodule_template}=       OperatingSystem.Get File    ${vfmodule_template_name}
-    \    ${vfmodule_payload}= 	Template String		${vfmodule_template}		${dict}
+    \    ${vfmodule_payload}= 	Apply Template		cds    ${vfmodule_template_name}		${dict}
     \	 ${data}= 	Catenate    ${data}   ${delim}   ${vfmodule_payload}
     \	 ${delim}= 	Catenate	,
     Log To Console 	${data}
diff --git a/robot/resources/vid/teardown_vid.robot b/robot/resources/vid/teardown_vid.robot
index ef65598b..d6880289 100644
--- a/robot/resources/vid/teardown_vid.robot
+++ b/robot/resources/vid/teardown_vid.robot
@@ -1,13 +1,12 @@
 *** Settings ***
 Documentation     The main interface for interacting with VID. It handles low level stuff like managing the selenium request library and VID required steps
 Library 	    SeleniumLibrary
-Library            Collections
+Library         Collections
 Library         String
-Library 	      StringTemplater
 Resource        vid_interface.robot
 Resource        create_vid_vnf.robot
 Resource        create_service_instance.robot
-Resource         ../heatbridge.robot
+Resource        ../heatbridge.robot
 
 *** Variables ***
 ${VID_ENV}            /vid