From 419876de3e915e02a86ca15df2c53cf3a0e412c5 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Wed, 8 Apr 2020 09:13:41 -0500 Subject: vFW Operational Policy tosca change Issue-ID: INT-1350 Change-Id: I3491b45f80038adbad1f5e25013dd22382be8a24 Signed-off-by: Brian Freeman Signed-off-by: mrichomme --- .../vFirewall_policy_operational_content.yaml | 35 ++++++++++++++++++++++ .../vFirewall_policy_operational_content.yaml | 25 ---------------- robot/resources/global_properties.robot | 3 +- robot/resources/policy_interface.robot | 3 +- 4 files changed, 39 insertions(+), 27 deletions(-) create mode 100644 robot/assets/policy/vFirewall_policy_operational_content.yaml delete mode 100644 robot/assets/templates/policy/vFirewall_policy_operational_content.yaml diff --git a/robot/assets/policy/vFirewall_policy_operational_content.yaml b/robot/assets/policy/vFirewall_policy_operational_content.yaml new file mode 100644 index 00000000..daafd798 --- /dev/null +++ b/robot/assets/policy/vFirewall_policy_operational_content.yaml @@ -0,0 +1,35 @@ +--- +topology_template: + policies: + - + operational.modifyconfig: + metadata: + policy-id: operational.modifyconfig + properties: + abatement: false + id: ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a + operations: + - + controllerName: frankfurt + description: "Modify the packet generator" + id: unique-policy-id-1-modifyConfig + operation: + actor: APPC + failure: final_failure + failure_exception: final_failure_exception + failure_guard: final_failure_guard + failure_retries: final_failure_retries + failure_timeout: final_failure_timeout + operation: ModifyConfig + retries: 0 + success: final_success + target: + entityIds: + resourceID: __RESOURCE_ID__ + targetType: VNF + timeout: 300 + timeout: 1200 + trigger: unique-policy-id-1-modifyConfig + type: onap.policies.controlloop.operational.common.Drools + type_version: "1.0.0" +tosca_definitions_version: tosca_simple_yaml_1_1_0 diff --git a/robot/assets/templates/policy/vFirewall_policy_operational_content.yaml b/robot/assets/templates/policy/vFirewall_policy_operational_content.yaml deleted file mode 100644 index 121c8b6e..00000000 --- a/robot/assets/templates/policy/vFirewall_policy_operational_content.yaml +++ /dev/null @@ -1,25 +0,0 @@ -controlLoop: - version: 2.0.0 - controlLoopName: ControlLoop-vFirewall-__RESOURCE_ID__ - trigger_policy: unique-policy-id-1-modifyConfig - timeout: 1200 - abatement: false -policies: - - id: unique-policy-id-1-modifyConfig - name: modify_packet_gen_config - description: - actor: APPC - recipe: ModifyConfig - target: - resourceID: __RESOURCE_ID__ - type: VNF - payload: - streams: '{"active-streams":5}' - retry: 0 - timeout: 300 - success: final_success - failure: final_failure - failure_timeout: final_failure_timeout - failure_retries: final_failure_retries - failure_exception: final_failure_exception - failure_guard: final_failure_guard 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} -- cgit 1.2.3-korg