aboutsummaryrefslogtreecommitdiffstats
path: root/robot/resources
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2020-04-08 09:13:41 -0500
committermrichomme <morgan.richomme@orange.com>2020-04-08 18:56:12 +0200
commit419876de3e915e02a86ca15df2c53cf3a0e412c5 (patch)
treeb919edb6a8a0a50f8262d12288d58583b9477d63 /robot/resources
parent52a02b2a4d2d9a6055a9ad0f0768f057f9259fb2 (diff)
vFW Operational Policy tosca change
Issue-ID: INT-1350 Change-Id: I3491b45f80038adbad1f5e25013dd22382be8a24 Signed-off-by: Brian Freeman <bf1936@att.com> Signed-off-by: mrichomme <morgan.richomme@orange.com>
Diffstat (limited to 'robot/resources')
-rw-r--r--robot/resources/global_properties.robot3
-rw-r--r--robot/resources/policy_interface.robot3
2 files changed, 4 insertions, 2 deletions
diff --git a/robot/resources/global_properties.robot b/robot/resources/global_properties.robot
index fd80e99b..993d9a66 100644
--- a/robot/resources/global_properties.robot
+++ b/robot/resources/global_properties.robot
@@ -35,9 +35,10 @@ ${GLOBAL_AAI_ZONE_NAME} nova
${GLOBAL_AAI_DESIGN_TYPE} integration
${GLOBAL_AAI_ZONE_CONTEXT} labs
${GLOBAL_TEMPLATE_FOLDER} robot/assets/templates
+${GLOBAL_ASSETS_FOLDER} robot/assets
${GLOBAL_SERVICE_MAPPING_DIRECTORY} ./demo/service_mapping
${GLOBAL_SO_HEALTH_CHECK_PATH} /manage/health
${GLOBAL_SO_CLOUD_CONFIG_PATH} /cloudSite
${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} so/create_cloud_config.jinja
${GLOBAL_SDC_DCAE_BE_ENDPOINT} ${GLOBAL_SDC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SDC_DCAE_BE_IP_ADDR}:${GLOBAL_SDC_DCAE_BE_PORT}
-${GLOBAL_SO_ORCHESTRATION_REQUESTS_PATH} /onap/so/infra/orchestrationRequests/v7 \ No newline at end of file
+${GLOBAL_SO_ORCHESTRATION_REQUESTS_PATH} /onap/so/infra/orchestrationRequests/v7
diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index f03ebb85..f3d40219 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -220,7 +220,8 @@ Create vFirewall Operational Policy
[Arguments] ${resource_id}
${dict}= Create Dictionary RESOURCE_ID=${resource_id}
Templating.Create Environment policy ${GLOBAL_TEMPLATE_FOLDER}
- ${content_data} OperatingSystem.Get File ${GLOBAL_TEMPLATE_FOLDER}/${POLICY_TEMPLATES}/vFirewall_policy_operational_content.yaml
+ #${content_data} OperatingSystem.Get File ${GLOBAL_TEMPLATE_FOLDER}/${POLICY_TEMPLATES}/vFirewall_policy_operational_content.yaml
+ ${content_data} OperatingSystem.Get File ${GLOBAL_ASSETS_FOLDER}/policy/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}