summaryrefslogtreecommitdiffstats
path: root/robot/assets
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-06-20 10:56:46 -0400
committerDR695H <dr695h@att.com>2019-06-20 10:56:46 -0400
commit3440942ef2c78e1a8eb07c70c1a03b3834beaecf (patch)
tree05aea2ab56cd115ca726b1fd5f6e922c70e45d9a /robot/assets
parent369e51562f068d5e653211902efc69220508eca1 (diff)
move portal, pgn, pnf policy to jinja
Issue-ID: TEST-158 Change-Id: Ie27f2cf976e76471bf65f0ffd506a82f0e9caf09 Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/assets')
-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
13 files changed, 16 insertions, 16 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}
- }
-}