aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--robot/assets/templates/aai/add_pnf_registration_info.jinja (renamed from robot/assets/templates/aai/add_pnf_registration_info.template)2
-rw-r--r--robot/assets/templates/policy/FirewallPolicy_delete.jinja (renamed from robot/assets/templates/policy/FirewallPolicy_delete.template)2
-rw-r--r--robot/assets/templates/policy/FirewallPolicy_push.jinja (renamed from robot/assets/templates/policy/FirewallPolicy_push.template)0
-rw-r--r--robot/assets/templates/policy/FirewallPolicy_update.jinja (renamed from robot/assets/templates/policy/FirewallPolicy_update.template)2
-rw-r--r--robot/assets/templates/policy/vFirewall_policy_monitoring_input_tosca.jinja (renamed from robot/assets/templates/policy/vFirewall_policy_monitoring_input_tosca.template)0
-rw-r--r--robot/assets/templates/policy/vFirewall_policy_operational_url_enc_content_input.jinja (renamed from robot/assets/templates/policy/vFirewall_policy_operational_url_enc_content_input.template)2
-rw-r--r--robot/assets/templates/policy/vFirewall_push.jinja (renamed from robot/assets/templates/policy/vFirewall_push.template)2
-rw-r--r--robot/assets/templates/portal/portal.jinja (renamed from robot/assets/templates/portal-sdk/portal.template)2
-rw-r--r--robot/assets/templates/ves/pnf_registration_request.jinja (renamed from robot/assets/templates/ves/pnf_registration_request.template)6
-rw-r--r--robot/assets/templates/vfw/vfw_pg_stream_enable.jinja (renamed from robot/assets/templates/vfw_pg_stream_enable.template)2
-rw-r--r--robot/assets/templates/vfw/vfw_pg_streams_enable.jinja (renamed from robot/assets/templates/vfw_pg_streams_enable.template)2
-rw-r--r--robot/assets/templates/vfw/vfw_pg_streams_v2.jinja5
-rw-r--r--robot/assets/templates/vfw_pg_streams_v2.template5
-rw-r--r--robot/resources/policy_interface.robot67
-rw-r--r--robot/resources/portal-sdk/portalDef.robot7
-rw-r--r--robot/resources/stack_validation/packet_generator_interface.robot21
-rw-r--r--robot/resources/test_templates/pnf_registration_without_SO_template.robot12
17 files changed, 73 insertions, 66 deletions
diff --git a/robot/assets/templates/aai/add_pnf_registration_info.template b/robot/assets/templates/aai/add_pnf_registration_info.jinja
index 2122ef24..0403228a 100644
--- a/robot/assets/templates/aai/add_pnf_registration_info.template
+++ b/robot/assets/templates/aai/add_pnf_registration_info.jinja
@@ -1,5 +1,5 @@
{
- "pnf-name": "${correlation_id}",
+ "pnf-name": "{{correlation_id}}",
"pnf-name2": "example-pnf-name2-val-78244",
"pnf-name2-source": "example-pnf-name2-source-val-99275",
"pnf-id": "example-pnf-id-val-7989",
diff --git a/robot/assets/templates/policy/FirewallPolicy_delete.template b/robot/assets/templates/policy/FirewallPolicy_delete.jinja
index c88d718a..996b175a 100644
--- a/robot/assets/templates/policy/FirewallPolicy_delete.template
+++ b/robot/assets/templates/policy/FirewallPolicy_delete.jinja
@@ -1,6 +1,6 @@
{
"pdpGroup": "default",
"policyComponent" : "PDP",
- "policyName": "com.BRMSParamvFirewall",
+ "policyName": "{{policyName}}",
"policyType": "BRMS_Param"
}
diff --git a/robot/assets/templates/policy/FirewallPolicy_push.template b/robot/assets/templates/policy/FirewallPolicy_push.jinja
index 46033f84..46033f84 100644
--- a/robot/assets/templates/policy/FirewallPolicy_push.template
+++ b/robot/assets/templates/policy/FirewallPolicy_push.jinja
diff --git a/robot/assets/templates/policy/FirewallPolicy_update.template b/robot/assets/templates/policy/FirewallPolicy_update.jinja
index a5709f56..4adb1ce4 100644
--- a/robot/assets/templates/policy/FirewallPolicy_update.template
+++ b/robot/assets/templates/policy/FirewallPolicy_update.jinja
@@ -10,7 +10,7 @@
"RULE": {
"templateName": "ClosedLoopControlName",
"closedLoopControlName": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
- "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a%0D%0A++trigger_policy%3A+unique-policy-id-1-modifyConfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-modifyConfig%0D%0A++++name%3A+modify+packet+gen+config%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+TBD+-+Cannot+be+known+until+instantiation+is+done%0D%0A++++++resourceID%3A+${RESOURCE_ID}%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+300%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
+ "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a%0D%0A++trigger_policy%3A+unique-policy-id-1-modifyConfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-modifyConfig%0D%0A++++name%3A+modify+packet+gen+config%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+TBD+-+Cannot+be+known+until+instantiation+is+done%0D%0A++++++resourceID%3A+{{RESOURCE_ID}}%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+300%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
}
}
}
diff --git a/robot/assets/templates/policy/vFirewall_policy_monitoring_input_tosca.template b/robot/assets/templates/policy/vFirewall_policy_monitoring_input_tosca.jinja
index 470195f0..470195f0 100644
--- a/robot/assets/templates/policy/vFirewall_policy_monitoring_input_tosca.template
+++ b/robot/assets/templates/policy/vFirewall_policy_monitoring_input_tosca.jinja
diff --git a/robot/assets/templates/policy/vFirewall_policy_operational_url_enc_content_input.template b/robot/assets/templates/policy/vFirewall_policy_operational_url_enc_content_input.jinja
index b971a89b..414180cd 100644
--- a/robot/assets/templates/policy/vFirewall_policy_operational_url_enc_content_input.template
+++ b/robot/assets/templates/policy/vFirewall_policy_operational_url_enc_content_input.jinja
@@ -1,4 +1,4 @@
{
"policy-id" : "operational.modifyconfig",
- "content" : "${URL_ENCODED_CONTENT}"
+ "content" : "{{URL_ENCODED_CONTENT}}"
}
diff --git a/robot/assets/templates/policy/vFirewall_push.template b/robot/assets/templates/policy/vFirewall_push.jinja
index 35813a1e..7c4a2c9d 100644
--- a/robot/assets/templates/policy/vFirewall_push.template
+++ b/robot/assets/templates/policy/vFirewall_push.jinja
@@ -6,7 +6,7 @@
},
{
"policy-id": "operational.modifyconfig",
- "policy-version": "${OP_POLICY_VERSION}.0.0"
+ "policy-version": "{{OP_POLICY_VERSION}}.0.0"
}
]
}
diff --git a/robot/assets/templates/portal-sdk/portal.template b/robot/assets/templates/portal/portal.jinja
index 57a3b798..005cb50b 100644
--- a/robot/assets/templates/portal-sdk/portal.template
+++ b/robot/assets/templates/portal/portal.jinja
@@ -1,5 +1,5 @@
{
-"application" : "${jira_id}",
+"application" : "{{jira_id}}",
"event" : {
"body" : {
"ticketStatePhrase" : "We recently detected a problem with the equipment at your site. The event is in queue for immediate work.",
diff --git a/robot/assets/templates/ves/pnf_registration_request.template b/robot/assets/templates/ves/pnf_registration_request.jinja
index 61b46d16..ddbbf14d 100644
--- a/robot/assets/templates/ves/pnf_registration_request.template
+++ b/robot/assets/templates/ves/pnf_registration_request.jinja
@@ -15,7 +15,7 @@
"lastEpochMicrosec": 1538407540940,
"eventName": "pnfRegistration_Nokia_5gDu",
"vesEventListenerVersion": "7.0.1",
- "sourceName": "${correlation_id}",
+ "sourceName": "{{correlation_id}}",
"nfNamingCode": "gNB"
},
"pnfRegistrationFields": {
@@ -27,8 +27,8 @@
"lastServiceDate": "1538407540942",
"unitFamily": "BBU",
"vendorName": "Nokia",
- "oamV4IpAddress": "${PNF_IPv4_address}",
- "oamV6IpAddress": "${PNF_IPv6_address}",
+ "oamV4IpAddress": "{{PNF_IPv4_address}}",
+ "oamV6IpAddress": "{{PNF_IPv6_address}}",
"softwareVersion": "val7"
}
}
diff --git a/robot/assets/templates/vfw_pg_stream_enable.template b/robot/assets/templates/vfw/vfw_pg_stream_enable.jinja
index c5036334..9611d58f 100644
--- a/robot/assets/templates/vfw_pg_stream_enable.template
+++ b/robot/assets/templates/vfw/vfw_pg_stream_enable.jinja
@@ -1,4 +1,4 @@
{
- "id" : "${stream}",
+ "id" : "{{stream}}",
"is-enabled" : "true"
}
diff --git a/robot/assets/templates/vfw_pg_streams_enable.template b/robot/assets/templates/vfw/vfw_pg_streams_enable.jinja
index 8f5fec61..247d5506 100644
--- a/robot/assets/templates/vfw_pg_streams_enable.template
+++ b/robot/assets/templates/vfw/vfw_pg_streams_enable.jinja
@@ -1,7 +1,7 @@
{
"pg-streams" : {
"pg-stream" : [
-${pgstreams}
+{{pgstreams}}
]
}
}
diff --git a/robot/assets/templates/vfw/vfw_pg_streams_v2.jinja b/robot/assets/templates/vfw/vfw_pg_streams_v2.jinja
new file mode 100644
index 00000000..333faabc
--- /dev/null
+++ b/robot/assets/templates/vfw/vfw_pg_streams_v2.jinja
@@ -0,0 +1,5 @@
+{
+ "streams": {
+ "active-streams": {{number_streams}}
+ }
+}
diff --git a/robot/assets/templates/vfw_pg_streams_v2.template b/robot/assets/templates/vfw_pg_streams_v2.template
deleted file mode 100644
index 81626144..00000000
--- a/robot/assets/templates/vfw_pg_streams_v2.template
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "streams": {
- "active-streams": ${number_streams}
- }
-}
diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index cc693224..c326760f 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -5,7 +5,7 @@ Library String
Library Collections
Library SSHLibrary
Library OperatingSystem
-Resource json_templater.robot
+Library ONAPLibrary.Templating
Resource global_properties.robot
Resource ssh/files.robot
@@ -13,7 +13,7 @@ Resource ssh/files.robot
${POLICY_HEALTH_CHECK_PATH} /healthcheck
${POLICY_ENDPOINT} ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_IP_ADDR}:${GLOBAL_POLICY_SERVER_PORT}
${POLICY_HEALTHCHECK_ENDPOINT} ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR}:${GLOBAL_POLICY_HEALTHCHECK_PORT}
-${POLICY_TEMPLATES} robot/assets/templates/policy
+${POLICY_TEMPLATES} policy
${DROOLS_ENDPOINT} ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_IP_ADDR}:${GLOBAL_DROOLS_SERVER_PORT}
${POLICY_API_IP} ${GLOBAL_INJECTED_POLICY_API_IP_ADDR}
${POLICY_PAP_IP} ${GLOBAL_INJECTED_POLICY_PAP_IP_ADDR}
@@ -172,22 +172,26 @@ Update vVFWCL Policy
Delete vFWCL Policy
- ${data}= OperatingSystem.Get File ${POLICY_TEMPLATES}/FirewallPolicy_delete.template
- ${resp}= Run Policy Delete Request /pdp/api/deletePolicy ${data}
- Should Be Equal As Strings ${resp.status_code} 200
+ Create Environment policy ${GLOBAL_TEMPLATE_FOLDER}
+ ${dict}= Create Dictionary policyName=com.BRMSParamvFirewall
+ ${data}= Apply Template policy ${POLICY_TEMPLATES}/FirewallPolicy_delete.jinja ${dict}
+ ${resp}= Run Policy Delete Request /pdp/api/deletePolicy ${data}
+ Should Be Equal As Strings ${resp.status_code} 200
Create vFWCL Policy
[Arguments] ${resource_id}
${dict}= Create Dictionary RESOURCE_ID=${resource_id}
- ${data}= Fill JSON Template File ${POLICY_TEMPLATES}/FirewallPolicy_update.template ${dict}
+ Create Environment policy ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Apply Template policy ${POLICY_TEMPLATES}/FirewallPolicy_update.jinja ${dict}
${resp}= Run Policy Put Request /pdp/api/updatePolicy ${data}
Should Be Equal As Strings ${resp.status_code} 200
Push vFWCL Policy
- ${dict}= Create Dictionary
- ${data}= Fill JSON Template File ${POLICY_TEMPLATES}/FirewallPolicy_push.template ${dict}
- ${resp}= Run Policy Put Request /pdp/api/pushPolicy ${data}
- Should Be Equal As Strings ${resp.status_code} 200
+ Create Environment policy ${GLOBAL_TEMPLATE_FOLDER}
+ ${dict}= Create Dictionary
+ ${data}= Apply Template policy ${POLICY_TEMPLATES}/FirewallPolicy_push.jinja ${dict}
+ ${resp}= Run Policy Put Request /pdp/api/pushPolicy ${data}
+ Should Be Equal As Strings ${resp.status_code} 200
Reboot Drools
${stop}= Catenate docker exec -t -u policy drools bash -c "source /opt/app/policy/etc/profile.d/env.sh; policy stop"
@@ -217,35 +221,32 @@ Validate the vFWCL Policy
Create vFirewall Monitoring Policy
${dict}= Create Dictionary
- ${data}= Fill JSON Template File ${POLICY_TEMPLATES}/vFirewall_policy_monitoring_input_tosca.template ${dict}
+ Create Environment policy ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Apply Template policy ${POLICY_TEMPLATES}/vFirewall_policy_monitoring_input_tosca.jinja ${dict}
${resp}= Run Policy Api Post Request /policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies ${data}
Should Be Equal As Strings ${resp.status_code} 200
Create vFirewall Operational Policy
- [Arguments] ${resource_id}
- ${dict}= Create Dictionary RESOURCE_ID=${resource_id}
- ${content_data} OperatingSystem.Get File ${POLICY_TEMPLATES}/vFirewall_policy_operational_content.yaml
- ${content_data}= Replace String Using Regexp ${content_data} __RESOURCE_ID__ ${resource_id}
- ${encoded_content_data}= Evaluate urllib.quote_plus('''${content_data}''') urllib
- ${content_dictionary}= Create Dictionary URL_ENCODED_CONTENT ${encoded_content_data}
- ${data_2}= Fill JSON Template File ${POLICY_TEMPLATES}/vFirewall_policy_operational_url_enc_content_input.template ${content_dictionary}
- Log To Console ${data_2}
- ${resp}= Run Policy Api Post Request /policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies ${data_2}
- #
- # pre-encoded content version
- #${data}= Fill JSON Template File ${POLICY_TEMPLATES}/vFirewall_policy_operational_input.template ${dict}
- #${resp}= Run Policy Api Post Request /policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies ${data}
- #
- Should Be Equal As Strings ${resp.status_code} 200
- [Return] ${resp.json()['policy-version']}
+ [Arguments] ${resource_id}
+ ${dict}= Create Dictionary RESOURCE_ID=${resource_id}
+ Create Environment policy ${GLOBAL_TEMPLATE_FOLDER}
+ ${content_data} OperatingSystem.Get File ${POLICY_TEMPLATES}/vFirewall_policy_operational_content.yaml
+ ${content_data}= Replace String Using Regexp ${content_data} __RESOURCE_ID__ ${resource_id}
+ ${encoded_content_data}= Evaluate urllib.quote_plus('''${content_data}''') urllib
+ ${content_dictionary}= Create Dictionary URL_ENCODED_CONTENT ${encoded_content_data}
+ ${data_2}= Apply Template policy ${POLICY_TEMPLATES}/vFirewall_policy_operational_url_enc_content_input.jinja ${content_dictionary}
+ Log To Console ${data_2}
+ ${resp}= Run Policy Api Post Request /policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies ${data_2}
+ Should Be Equal As Strings ${resp.status_code} 200
+ [Return] ${resp.json()['policy-version']}
Push vFirewall Policies To PDP Group
- [Arguments] ${op_policy_version}
- ${dict}= Create Dictionary OP_POLICY_VERSION=${op_policy_version}
- ${data}= Fill JSON Template File ${POLICY_TEMPLATES}/vFirewall_push.template ${dict}
- #${resp}= Run Policy Post Request /policy/pap/v1/pdps/policies ${data}
- ${resp}= Run Policy Pap Post Request /policy/pap/v1/pdps/policies ${data}
- Should Be Equal As Strings ${resp.status_code} 200
+ [Arguments] ${op_policy_version}
+ ${dict}= Create Dictionary OP_POLICY_VERSION=${op_policy_version}
+ Create Environment policy ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Apply Template policy ${POLICY_TEMPLATES}/vFirewall_push.jinja ${dict}
+ ${resp}= Run Policy Pap Post Request /policy/pap/v1/pdps/policies ${data}
+ Should Be Equal As Strings ${resp.status_code} 200
Run Policy API Healthcheck
[Documentation] Runs Policy Api Health check
diff --git a/robot/resources/portal-sdk/portalDef.robot b/robot/resources/portal-sdk/portalDef.robot
index 59808357..3cd2a6f4 100644
--- a/robot/resources/portal-sdk/portalDef.robot
+++ b/robot/resources/portal-sdk/portalDef.robot
@@ -7,8 +7,8 @@ Library DateTime
Library Collections
Library StringTemplater
Library String
+Library ONAPLibrary.Templating
-Resource ../json_templater.robot
Resource ../browser_setup.robot
*** Variables ***
@@ -30,7 +30,7 @@ ${GLOBAL_BUILD_NUMBER} 0
${GLOBAL_VM_PRIVATE_KEY} ${EXECDIR}/robot/assets/keys/robot_ssh_private_key.pvt
${jira} jira
${RESOURCE_PATH} ${PORTAL_URL}/auxapi/ticketevent
-${portal_Template} ${CURDIR}/portal.template
+${portal_Template} portal/portal.jinja
${download_link_id} 0
@@ -859,7 +859,8 @@ Enhanced Notification on ONAP Portal
Notification on ONAP Portal
[Documentation] Create Config portal
${configportal}= Create Dictionary jira_id=${jira}
- ${output} = Fill JSON Template File ${portal_Template} ${configportal}
+ Create Environment portal ${GLOBAL_TEMPLATE_FOLDER}
+ ${output} = Apply Template portal ${portal_Template} ${configportal}
${post_resp} = Enhanced Notification on ONAP Portal ${RESOURCE_PATH} ${output}
Should Be Equal As Strings ${post_resp.status_code} 200
diff --git a/robot/resources/stack_validation/packet_generator_interface.robot b/robot/resources/stack_validation/packet_generator_interface.robot
index 2a30ba2a..5482aaa3 100644
--- a/robot/resources/stack_validation/packet_generator_interface.robot
+++ b/robot/resources/stack_validation/packet_generator_interface.robot
@@ -3,17 +3,17 @@ Documentation The main interface for interacting with A&AI. It handles low l
Library RequestsLibrary
Library StringTemplater
Library ONAPLibrary.Utilities
+Library ONAPLibrary.Templating
Library OperatingSystem
Resource ../global_properties.robot
-Resource ../json_templater.robot
*** Variables ***
${PGN_URL_TEMPLATE} http://\${host}:\${port}
${PGN_PATH} /restconf/config/sample-plugin:sample-plugin
${PGN_PATH_V2} /restconf/config/stream-count:stream-count
-${PGN_ENABLE_STREAM_TEMPLATE} robot/assets/templates/vfw_pg_stream_enable.template
-${PGN_ENABLE_STREAMS_TEMPLATE} robot/assets/templates/vfw_pg_streams_enable.template
-${PGN_ENABLE_STREAMS_V2_TEMPLATE} robot/assets/templates/vfw_pg_streams_v2.template
+${PGN_ENABLE_STREAM_TEMPLATE} vfw/vfw_pg_stream_enable.jinja
+${PGN_ENABLE_STREAMS_TEMPLATE} vfw/vfw_pg_streams_enable.jinja
+${PGN_ENABLE_STREAMS_V2_TEMPLATE} vfw/vfw_pg_streams_v2.jinja
*** Keywords ***
Connect To Packet Generator
@@ -32,10 +32,11 @@ Enable Stream
${headers}= Create Headers
${data_path}= Catenate ${PGN_PATH}/pg-streams
${map}= Create Dictionary stream=${stream}
- ${streams}= Fill JSON Template File ${PGN_ENABLE_STREAM_TEMPLATE} ${map}
+ Create Environment pgi ${GLOBAL_TEMPLATE_FOLDER}
+ ${streams}= Apply Template pgi ${PGN_ENABLE_STREAM_TEMPLATE} ${map}
${streams}= evaluate json.dumps(${streams}) json
${map}= Create Dictionary pgstreams=${streams}
- ${data}= Fill JSON Template File ${PGN_ENABLE_STREAMS_TEMPLATE} ${map}
+ ${data}= Apply Template pgi ${PGN_ENABLE_STREAMS_TEMPLATE} ${map}
${resp}= Put Request ${alias} ${data_path} data=${data} headers=${headers}
Should Be Equal As Strings ${resp.status_code} 200
[Return] ${resp}
@@ -49,15 +50,16 @@ Enable Streams
${streams}= Set Variable
${comma}= Set Variable
${stream_count}= Evaluate ${stream_count}+1
+ Create Environment pgi ${GLOBAL_TEMPLATE_FOLDER}
:FOR ${i} IN RANGE 1 ${stream_count}
\ ${name}= Catenate ${prefix}${i}
\ ${map}= Create Dictionary stream=${name}
- \ ${one}= Fill JSON Template File ${PGN_ENABLE_STREAM_TEMPLATE} ${map}
+ \ ${one}= Apply Template pgi ${PGN_ENABLE_STREAM_TEMPLATE} ${map}
\ ${one}= evaluate json.dumps(${one}) json
\ ${streams}= Set Variable ${streams}${comma}${one}
\ ${comma}= Set Variable ,
${map}= Create Dictionary pgstreams=${streams}
- ${data}= Fill JSON Template File ${PGN_ENABLE_STREAMS_TEMPLATE} ${map}
+ ${data}= Apply Template pgi ${PGN_ENABLE_STREAMS_TEMPLATE} ${map}
${resp}= Put Request ${alias} ${data_path} data=${data} headers=${headers}
Should Be Equal As Strings ${resp.status_code} 200
[Return] ${resp}
@@ -68,10 +70,11 @@ Enable Streams V2
... Enable <stream_count> number of streams on the passed packet generator host IP
[Arguments] ${host} ${stream_count}=5 ${alias}=pgn ${prefix}=fw_udp
Connect To Packet Generator ${host} alias=${alias}
+ Create Environment pgi ${GLOBAL_TEMPLATE_FOLDER}
${headers}= Create Headers
${data_path}= Catenate ${PGN_PATH_V2}/streams
${map}= Create Dictionary number_streams=${stream_count}
- ${data}= Fill JSON Template File ${PGN_ENABLE_STREAMS_V2_TEMPLATE} ${map}
+ ${data}= Apply Template pgi ${PGN_ENABLE_STREAMS_V2_TEMPLATE} ${map}
${resp}= Put Request ${alias} ${data_path} data=${data} headers=${headers}
Should Be Equal As Strings ${resp.status_code} 200
diff --git a/robot/resources/test_templates/pnf_registration_without_SO_template.robot b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
index ae8ab2b9..497bbeb2 100644
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -2,18 +2,18 @@
Documentation PNF Registration Handler (PRH) test cases
Resource ../aai/aai_interface.robot
Resource ../mr_interface.robot
-Resource ../json_templater.robot
Library ONAPLibrary.Openstack
Library OperatingSystem
Library RequestsLibrary
Library Collections
Library ONAPLibrary.JSON
Library ONAPLibrary.Utilities
+Library ONAPLibrary.Templating
*** Variables ***
-${aai_so_registration_entry_template}= robot/assets/templates/aai/add_pnf_registration_info.template
-${pnf_ves_integration_request}= robot/assets/templates/ves/pnf_registration_request.template
+${aai_so_registration_entry_template}= aai/add_pnf_registration_info.jinja
+${pnf_ves_integration_request}= ves/pnf_registration_request.jinja
${DMAAP_MESSAGE_ROUTER_UNAUTHENTICATED_PNF_PATH} /events/unauthenticated.PNF_READY/2/1
${VES_ENDPOINT} ${GLOBAL_DCAE_VES_PROTOCOL}://${GLOBAL_INJECTED_DCAE_VES_HOST}:${GLOBAL_DCAE_VES_SERVER_PORT}
${VES_data_path} /eventListener/v7
@@ -30,7 +30,8 @@ Create A&AI antry without SO and succesfully registrate PNF
Create PNF initial entry in A&AI
[Documentation] Creates PNF initial entry in A&AI registry. Entry contains only correlation id (pnf-name)
[Arguments] ${PNF_entry_dict}
- ${template}= Fill Json Template File ${aai_so_registration_entry_template} ${PNF_entry_dict}
+ Create Environment aai ${GLOBAL_TEMPLATE_FOLDER}
+ ${template}= Apply Template aai ${aai_so_registration_entry_template} ${PNF_entry_dict}
Log Filled A&AI entry template ${template}
${correlation_id}= Get From Dictionary ${PNF_entry_dict} correlation_id
${del_resp}= Delete A&AI Entity /network/pnfs/pnf/${PNF_entry_dict.correlation_id}
@@ -41,7 +42,8 @@ Create PNF initial entry in A&AI
Send VES integration request
[Documentation] Send VES integration request. Request contains correlation id (sourceName), oamV4IpAddress and oamV6IpAddress
[Arguments] ${PNF_entry_dict}
- ${template}= Fill Json Template File ${pnf_ves_integration_request} ${PNF_entry_dict}
+ Create Environment aai ${GLOBAL_TEMPLATE_FOLDER}
+ ${template}= Apply Template aai ${pnf_ves_integration_request} ${PNF_entry_dict}
${post_resp}= Run VES HTTP Post Request ${template}
Should Be Equal As Strings ${post_resp.status_code} 202
Log VES integration request has been send