diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2022-12-20 18:58:55 +0000 |
|---|---|---|
| committer |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-01-26 16:14:35 +0000 |
| commit | 99507033a51c4dfbabc6372c29f43300947be5d6 (patch) | |
| tree | 4185c4e1ddb7353fcf6a6dfc7a8afd2ace1055b4 | |
| parent | 8b8a4cff5ca8d1bfec1133d8713bb8931d56e1aa (diff) | |
[APPC] Remove APPC junk
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Ibe45140261245e80a3a662d64c8a1935acabf5af
Issue-ID: OOM-3069
15 files changed, 1 insertions, 238 deletions
diff --git a/html/index.html b/html/index.html index 7110a202..35ca0940 100644 --- a/html/index.html +++ b/html/index.html @@ -85,7 +85,6 @@ GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "d570c718cbc545029f40e50b75eb13df" GLOBAL_INJECTED_REGION = "RegionOne" GLOBAL_INJECTED_KEYSTONE = "http://10.12.25.2:5000" GLOBAL_INJECTED_AAI_IP_ADDR = "aai.onap" -GLOBAL_INJECTED_APPC_IP_ADDR = "appc.onap" GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-healthcheck.onap" GLOBAL_INJECTED_SO_IP_ADDR = "so.onap" GLOBAL_INJECTED_MR_IP_ADDR = "message-router.onap" @@ -156,7 +155,6 @@ GLOBAL_INJECTED_PUBLIC_NET_ID = "971040b2-7059-49dc-b220-4fab50cb2ad4" some important once listed below. <p> <ul> - <li> <a href="http://message-router.onap:3904/events/APPC-CL/monitor/0?timeout=10000"> APPC-CL Topic -- Policy Publishes Requests and APP-C publishes response </a> <li> <a href="http://message-router.onap:3904/events/PDPP-CONFIGURATION/monitor/0?timeout=10000"> PDPD-CONFIGURATION Topic </a> <li> <a href="http://message-router.onap:3904/events/POLICY-CL-MGT/monitor/0?timeout=10000"> POLICY-CL-MGT Topic -- Control loop operational policy </a> <li> <a href="http://message-router.onap:3904/events/DCAE-CL-EVENT/monitor/0?timeout=10000"> DCAE-CL-EVENT Topic -- Provides the Analytics output from DCAE</a> diff --git a/robot/assets/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml b/robot/assets/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml deleted file mode 100644 index 8b308dcb..00000000 --- a/robot/assets/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -kind: "Property Definition" -version: V1 -vnf-parameter-list: -- name: ip-addr - type: null - description: null - required: "true" - default: null - source: Manual - rule-type: null - request-keys: null - response-keys: null -- name: oam-ip-addr - type: null - description: null - required: "true" - default: null - source: Manual - rule-type: null - request-keys: null - response-keys: null -- name: enabled - type: null - description: null - required: "true" - default: null - source: Manual - rule-type: null - request-keys: null - response-keys: null diff --git a/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json b/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json deleted file mode 100644 index cc5b6b72..00000000 --- a/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "reference_data": [ - { - "action": "ConfigScaleOut", - "action-level": "vnf", - "scope": { - "vnf-type": "vLoadBalancer/vLoadBalancer-test 0", - "vnfc-type": "" - }, - "template": "Y", - "vm": [], - "device-protocol": "NETCONF-XML", - "user-name": "admin", - "port-number": "2831", - "artifact-list": [ - { - "artifact-name": "template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml", - "artifact-type": "config_template" - }, - { - "artifact-name": "pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml", - "artifact-type": "parameter_definitions" - } - ], - "template-id-list": [ - "vLB" - ], - "template-id": "vLB", - "scopeType": "vnf-type" - }, - { - "action": "AllAction", - "action-level": "vnf", - "scope": { - "vnf-type": "vLoadBalancer/vLoadBalancer-test 0", - "vnfc-type": "" - }, - "artifact-list": [ - { - "artifact-name": "reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json", - "artifact-type": "reference_template" - } - ] - } - ] -} diff --git a/robot/assets/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml b/robot/assets/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml deleted file mode 100644 index 61d24976..00000000 --- a/robot/assets/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vlb-business-vnf-onap-plugin xmlns="urn:opendaylight:params:xml:ns:yang:vlb-business-vnf-onap-plugin"> - <vdns-instances> - <vdns-instance> - <ip-addr>${ip-addr}</ip-addr> - <oam-ip-addr>${oam-ip-addr}</oam-ip-addr> - <enabled>${enabled}</enabled> - </vdns-instance> - </vdns-instances> -</vlb-business-vnf-onap-plugin>
\ No newline at end of file diff --git a/robot/assets/security/ExpectedNodePorts.json b/robot/assets/security/ExpectedNodePorts.json index 8b719ce4..23cf80a8 100644 --- a/robot/assets/security/ExpectedNodePorts.json +++ b/robot/assets/security/ExpectedNodePorts.json @@ -10,7 +10,6 @@ "30208": "sdnc-8202", "30209": "httpd", "30210": "aai-modelloader", - "30211": "appc-9090", "30212": "portal-sdk", "30213": "portal-app", "30214": "portal-app3", @@ -25,8 +24,6 @@ "30227": "message-router-3904", "30228": "dgbuilder", "30229": "aai-modelloader-ssl", - "30230": "appc-8282", - "30231": "appc-1830", "30233": "aai-ssl", "30234": "pomba-kibana", "30235": "xport-t-8080", @@ -67,7 +64,6 @@ "30285": "http-msb-consul", "30286": "client", "30287": "gossip", - "30289": "appc-cdt", "30290": "cdash-kibana", "30297": "refrepo", "30299": "https", diff --git a/robot/assets/templates/clamp/save_model_vlb.jinja b/robot/assets/templates/clamp/save_model_vlb.jinja index 6e551d37..85d80590 100644 --- a/robot/assets/templates/clamp/save_model_vlb.jinja +++ b/robot/assets/templates/clamp/save_model_vlb.jinja @@ -1 +1 @@ -{"name":"{{MODEL_NAME}}","controlNamePrefix":"ClosedLoop-","bpmnText":"","propText":"{\"Policy_12lup3h\":{\"{{POLICY_NAME}}\":[{\"name\":\"pname\",\"value\":\"{{POLICY_NAME}}\"},{\"name\":\"pid\",\"value\":\"0\"},{\"name\":\"timeout\",\"value\":\"345\"},{\"policyConfigurations\":[[{\"name\":\"maxRetries\",\"value\":[\"3\"]},{\"name\":\"retryTimeLimit\",\"value\":[\"180\"]},{\"name\":\"_id\",\"value\":[\"YJ6lIO4\"]},{\"name\":\"parentPolicy\",\"value\":[\"\"]},{\"name\":\"actor\",\"value\":[\"APPC\"]},{\"name\":\"recipePayload\",\"value\":[\"\"]},{\"name\":\"recipeLevel\",\"value\":[\"\"]},{\"name\":\"targetResourceId\",\"value\":[\"\"]},{\"name\":\"targetResourceIdOther\",\"value\":[\"\"]},{\"name\":\"guardPolicyType\",\"value\":[\"GUARD_MIN_MAX\"]},{\"name\":\"guardTargets\",\"value\":[\".*\"]},{\"name\":\"minGuard\",\"value\":[\"1\"]},{\"name\":\"maxGuard\",\"value\":[\"1\"]},{\"name\":\"limitGuard\",\"value\":[\"1\"]},{\"name\":\"timeUnitsGuard\",\"value\":[\"minute\"]},{\"name\":\"timeWindowGuard\",\"value\":[\"10\"]},{\"name\":\"guardActiveStart\",\"value\":[\"00:00:01-05:00\"]},{\"name\":\"guardActiveEnd\",\"value\":[\"23:59:59-05:00\"]}]]}]},\"TCA_1d13unw\":{\"New_Set\":[{\"name\":\"tname\",\"value\":\"New_Set\"},{\"name\":\"tuuid\",\"value\":\"6aae3b26-6c63-t4de-f072-c812fb90204b\"},{\"name\":\"tcaPol\",\"value\":\"{{POLICY_NAME}}\"},{\"name\":\"eventName\",\"value\":\"vLoadBalancer\"},{\"name\":\"controlLoopSchemaType\",\"value\":\"VNF\"},{\"name\":\"tcaPolId\",\"value\":\"0\"},{\"serviceConfigurations\":[[\"{{DOLLAR_SIGN}}.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"GREATER\",\"200\",\"ONSET\"]]}]}}","imageText":"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\" width=\"100%\" height=\"100%\">\n\t\t<defs>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmnw\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"6\" refY=\"6\" id=\"markerSjdype4kmny\">\n\t\t\t\t\t\t<circle cx=\"6\" cy=\"6\" r=\"3.5\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></circle>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"8.5\" refY=\"5\" id=\"markerSjdype4kmo0\">\n\t\t\t\t\t\t<path d=\"m 1 5 l 0 -3 l 7 3 l -7 3 z\" style=\"stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmo2\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-1\" refY=\"10\" id=\"markerSjdype4kmo4\">\n\t\t\t\t\t\t<path d=\"M 0 10 L 8 6 L 16 10 L 8 14 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-5\" refY=\"10\" id=\"markerSjdype4kmo6\">\n\t\t\t\t\t\t<path d=\"M 1 4 L 5 16\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t</defs>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1\" transform=\"matrix(1,0,0,1,50,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1_label\" transform=\"matrix(1,0,0,1,23,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"VesCollector_1g9cmz0\" transform=\"matrix(1,0,0,1,207,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"120,80 120,20 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<polyline points=\"20,0 20,80 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"14\">V</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"26\">E</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"38\">S</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"25.5\" y=\"43.5\">VesCollector</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"TCA_1d13unw\" transform=\"matrix(1,0,0,1,453,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,60 120,60 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"48\" y=\"43.5\">TCA</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"Policy_12lup3h\" transform=\"matrix(1,0,0,1,687,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,40 60,0 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"43.5\" y=\"43.5\">Policy</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape selected\" data-element-id=\"EndEvent_16kg9fx\" transform=\"matrix(1,0,0,1,925,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 4;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-nw\" transform=\"matrix(1,0,0,1,0,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-ne\" transform=\"matrix(0,1,-1,0,36,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-se\" transform=\"matrix(-1,0,0,-1,36,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-sw\" transform=\"matrix(0,-1,1,0,0,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"EndEvent_16kg9fx_label\" transform=\"matrix(1,0,0,1,898,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1ahk7jg\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"80\" y=\"174\" width=\"133\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 86,180L207,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"86,180 207,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1ahk7jg_label\" transform=\"matrix(1,0,0,1,101.5,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_18ahat1\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"321\" y=\"174\" width=\"138\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 327,180L453,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"327,180 453,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_18ahat1_label\" transform=\"matrix(1,0,0,1,345,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1mo9gxb\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"567\" y=\"174\" width=\"126\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 573,180L687,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"573,180 687,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1mo9gxb_label\" transform=\"matrix(1,0,0,1,585,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1dgtrrq\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"801\" y=\"174\" width=\"130\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 807,180L925,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"807,180 925,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1dgtrrq_label\" transform=\"matrix(1,0,0,1,821,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n</svg>","templateName":"{{TEMPLATE_NAME}}","typeId":null,"deploymentId":null}
\ No newline at end of file +{"name":"{{MODEL_NAME}}","controlNamePrefix":"ClosedLoop-","bpmnText":"","propText":"{\"Policy_12lup3h\":{\"{{POLICY_NAME}}\":[{\"name\":\"pname\",\"value\":\"{{POLICY_NAME}}\"},{\"name\":\"pid\",\"value\":\"0\"},{\"name\":\"timeout\",\"value\":\"345\"},{\"policyConfigurations\":[[{\"name\":\"maxRetries\",\"value\":[\"3\"]},{\"name\":\"retryTimeLimit\",\"value\":[\"180\"]},{\"name\":\"_id\",\"value\":[\"YJ6lIO4\"]},{\"name\":\"parentPolicy\",\"value\":[\"\"]},{\"name\":\"recipePayload\",\"value\":[\"\"]},{\"name\":\"recipeLevel\",\"value\":[\"\"]},{\"name\":\"targetResourceId\",\"value\":[\"\"]},{\"name\":\"targetResourceIdOther\",\"value\":[\"\"]},{\"name\":\"guardPolicyType\",\"value\":[\"GUARD_MIN_MAX\"]},{\"name\":\"guardTargets\",\"value\":[\".*\"]},{\"name\":\"minGuard\",\"value\":[\"1\"]},{\"name\":\"maxGuard\",\"value\":[\"1\"]},{\"name\":\"limitGuard\",\"value\":[\"1\"]},{\"name\":\"timeUnitsGuard\",\"value\":[\"minute\"]},{\"name\":\"timeWindowGuard\",\"value\":[\"10\"]},{\"name\":\"guardActiveStart\",\"value\":[\"00:00:01-05:00\"]},{\"name\":\"guardActiveEnd\",\"value\":[\"23:59:59-05:00\"]}]]}]},\"TCA_1d13unw\":{\"New_Set\":[{\"name\":\"tname\",\"value\":\"New_Set\"},{\"name\":\"tuuid\",\"value\":\"6aae3b26-6c63-t4de-f072-c812fb90204b\"},{\"name\":\"tcaPol\",\"value\":\"{{POLICY_NAME}}\"},{\"name\":\"eventName\",\"value\":\"vLoadBalancer\"},{\"name\":\"controlLoopSchemaType\",\"value\":\"VNF\"},{\"name\":\"tcaPolId\",\"value\":\"0\"},{\"serviceConfigurations\":[[\"{{DOLLAR_SIGN}}.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"GREATER\",\"200\",\"ONSET\"]]}]}}","imageText":"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\" width=\"100%\" height=\"100%\">\n\t\t<defs>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmnw\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"6\" refY=\"6\" id=\"markerSjdype4kmny\">\n\t\t\t\t\t\t<circle cx=\"6\" cy=\"6\" r=\"3.5\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></circle>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"8.5\" refY=\"5\" id=\"markerSjdype4kmo0\">\n\t\t\t\t\t\t<path d=\"m 1 5 l 0 -3 l 7 3 l -7 3 z\" style=\"stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmo2\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-1\" refY=\"10\" id=\"markerSjdype4kmo4\">\n\t\t\t\t\t\t<path d=\"M 0 10 L 8 6 L 16 10 L 8 14 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-5\" refY=\"10\" id=\"markerSjdype4kmo6\">\n\t\t\t\t\t\t<path d=\"M 1 4 L 5 16\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t</defs>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1\" transform=\"matrix(1,0,0,1,50,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1_label\" transform=\"matrix(1,0,0,1,23,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"VesCollector_1g9cmz0\" transform=\"matrix(1,0,0,1,207,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"120,80 120,20 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<polyline points=\"20,0 20,80 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"14\">V</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"26\">E</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"38\">S</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"25.5\" y=\"43.5\">VesCollector</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"TCA_1d13unw\" transform=\"matrix(1,0,0,1,453,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,60 120,60 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"48\" y=\"43.5\">TCA</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"Policy_12lup3h\" transform=\"matrix(1,0,0,1,687,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,40 60,0 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"43.5\" y=\"43.5\">Policy</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape selected\" data-element-id=\"EndEvent_16kg9fx\" transform=\"matrix(1,0,0,1,925,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 4;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-nw\" transform=\"matrix(1,0,0,1,0,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-ne\" transform=\"matrix(0,1,-1,0,36,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-se\" transform=\"matrix(-1,0,0,-1,36,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-sw\" transform=\"matrix(0,-1,1,0,0,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"EndEvent_16kg9fx_label\" transform=\"matrix(1,0,0,1,898,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1ahk7jg\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"80\" y=\"174\" width=\"133\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 86,180L207,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"86,180 207,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1ahk7jg_label\" transform=\"matrix(1,0,0,1,101.5,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_18ahat1\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"321\" y=\"174\" width=\"138\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 327,180L453,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"327,180 453,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_18ahat1_label\" transform=\"matrix(1,0,0,1,345,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1mo9gxb\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"567\" y=\"174\" width=\"126\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 573,180L687,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"573,180 687,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1mo9gxb_label\" transform=\"matrix(1,0,0,1,585,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1dgtrrq\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"801\" y=\"174\" width=\"130\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 807,180L925,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"807,180 925,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1dgtrrq_label\" transform=\"matrix(1,0,0,1,821,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n</svg>","templateName":"{{TEMPLATE_NAME}}","typeId":null,"deploymentId":null}
\ No newline at end of file diff --git a/robot/assets/templates/web/index.html.jinja b/robot/assets/templates/web/index.html.jinja index 412e1a8d..4479f4b8 100644 --- a/robot/assets/templates/web/index.html.jinja +++ b/robot/assets/templates/web/index.html.jinja @@ -35,7 +35,6 @@ {{aai1}} aai1 aai.api.simpledemo.onap.org {{robot}} robot -{{appc}} appc {{so}} so {{sdnc}} sdnc {{openo}} multi-service @@ -50,7 +49,6 @@ {{policy}} {{prefix}}-policy {{aai1}} {{prefix}}-aai1 {{robot}} {{prefix}}-robot -{{appc}} {{prefix}}-appc {{so}} {{prefix}}-so {{sdnc}} {{prefix}}-sdnc {{openo}} {{prefix}}-multi-service @@ -86,7 +84,6 @@ GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "{{GLOBAL_INJECTED_OPENSTACK_TENANT_ID}}" GLOBAL_INJECTED_REGION = "{{GLOBAL_INJECTED_REGION}}" GLOBAL_INJECTED_KEYSTONE = "{{GLOBAL_INJECTED_KEYSTONE}}" GLOBAL_INJECTED_AAI_IP_ADDR = "{{aai1}}" -GLOBAL_INJECTED_APPC_IP_ADDR = "{{appc}}" GLOBAL_INJECTED_DCAE_IP_ADDR = "{{dcae_controller}}" GLOBAL_INJECTED_SO_IP_ADDR = "{{so}}" GLOBAL_INJECTED_MR_IP_ADDR = "{{message_router}}" @@ -111,10 +108,6 @@ GLOBAL_INJECTED_PUBLIC_NET_ID = "{{GLOBAL_INJECTED_PUBLIC_NET_ID}}" <a href="http://{{sdnc}}:8843/signup"> To sign up </a> <p> <a href="http://{{sdnc}}:8843/login"> Admin </a> <p> - <h2> App-C </h2> - - <a href="http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@{{appc}}:8282/apidoc/explorer/index.html"> Controller </a> with admin/Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U <p> - <h2> Policy </h2> <b> Not working. </b> : @@ -157,7 +150,6 @@ GLOBAL_INJECTED_PUBLIC_NET_ID = "{{GLOBAL_INJECTED_PUBLIC_NET_ID}}" some important once listed below. <p> <ul> - <li> <a href="http://{{message_router}}:3904/events/APPC-CL/monitor/0?timeout=10000"> APPC-CL Topic -- Policy Publishes Requests and APP-C publishes response </a> <li> <a href="http://{{message_router}}:3904/events/PDPP-CONFIGURATION/monitor/0?timeout=10000"> PDPD-CONFIGURATION Topic </a> <li> <a href="http://{{message_router}}:3904/events/POLICY-CL-MGT/monitor/0?timeout=10000"> POLICY-CL-MGT Topic -- Control loop operational policy </a> <li> <a href="http://{{message_router}}:3904/events/DCAE-CL-EVENT/monitor/0?timeout=10000"> DCAE-CL-EVENT Topic -- Provides the Analytics output from DCAE</a> @@ -173,7 +165,6 @@ GLOBAL_INJECTED_PUBLIC_NET_ID = "{{GLOBAL_INJECTED_PUBLIC_NET_ID}}" <a href="ssh://{{sdc}}"> SDC </a><p> <a href="ssh://{{portal}}"> Portal </a><p> <a href="ssh://{{dcae_controller}}"> DCAE </a><p> - <a href="ssh://{{appc}}"> APP-C </a><p> <a href="ssh://{{so}}"> SO </a><p> <a href="ssh://{{sdnc}}"> SDN-C </a><p> <a href="ssh://{{vid}}"> VID </a><p> diff --git a/robot/resources/appc_interface.robot b/robot/resources/appc_interface.robot deleted file mode 100644 index b031aab4..00000000 --- a/robot/resources/appc_interface.robot +++ /dev/null @@ -1,99 +0,0 @@ -*** Settings *** -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 ONAPLibrary.Templating WITH NAME Templating -Library SeleniumLibrary -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} 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/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml -${APPC_CDT_Config_Scaleout_PD} ${EXECDIR}/robot/assets/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml -${APPC_CDT_Config_Scaleout_REF} ${EXECDIR}/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json -${APPC_CDT_Config_Scaleout_REF_name} reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json -${APPC_CDT_ENDPOINT} ${GLOBAL_APPC_CDT_SERVER_PROTOCOL}://${GLOBAL_INJECTED_APPC_CDT_IP_ADDR}:${GLOBAL_APPC_CDT_SERVER_PORT} -${APPC_CDT_LOGIN_URL} ${APPC_CDT_ENDPOINT}/index.html - - -*** Keywords *** -Run APPC Health Check - [Documentation] Runs an APPC healthcheck - ${resp}= Run APPC Post Request ${APPC_INDEX PATH}${APPC_HEALTHCHECK_OPERATION_PATH} ${None} - Should Be Equal As Strings ${resp.status_code} 200 - Should Be Equal As Strings ${resp.json()['output']['response-code']} 200 - -Run APPC Post Request - [Documentation] Runs an APPC post request - [Arguments] ${data_path} ${data} ${content}=json - Log Creating session ${APPC_ENDPOINT} - ${session}= Create Session appc ${APPC_ENDPOINT} auth=${GLOBAL_APPC_AUTHENTICATION} - ${uuid}= Generate UUID4 - ${headers}= Create Dictionary Accept=application/${content} Content-Type=application/${content} X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Post Request appc ${data_path} data=${data} headers=${headers} - Log Received response from appc ${resp.text} - [Return] ${resp} - -Run APPC Put Request - [Documentation] Runs an APPC post request - [Arguments] ${data_path} ${data} ${content}=xml - Log Creating session ${APPC_ENDPOINT} - ${session}= Create Session appc ${APPC_ENDPOINT} auth=${GLOBAL_APPC_AUTHENTICATION} - ${uuid}= Generate UUID4 - ${headers}= Create Dictionary Accept=application/${content} Content-Type=application/${content} X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Put Request appc ${data_path} data=${data} headers=${headers} - Log Received response from appc ${resp.text} - [Return] ${resp} - -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} - Templating.Create Environment appc ${GLOBAL_TEMPLATE_FOLDER} - ${data}= Templating.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} - -Preload APPC CDT GUI - [Documentation] APPC CDT GUI Preload - [Arguments] ${username}=${GLOBAL_APPC_CDT_USERNAME} ${reference_file_name}=${APPC_CDT_Config_Scaleout_REF_name} ${reference_file}=${APPC_CDT_Config_Scaleout_REF} ${template_file}=${APPC_CDT_Config_Scaleout} ${parameterdefinition_file}=${APPC_CDT_Config_Scaleout_PD} - # Setup Browser Now being managed by test case - ##Setup Browser - Go To ${APPC_CDT_LOGIN_URL}#/home - Set Selenium Speed ${GLOBAL_SELENIUM_DELAY} - Set Browser Implicit Wait ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} - Log Logging in to ${APPC_CDT_ENDPOINT} - Handle Proxy Warning - Wait Until Page Contains WELCOME ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} - Go To ${APPC_CDT_LOGIN_URL}#/vnfs - Wait Until Element Is Visible id=userId ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} - Input Text id=userId ${username} - Click Button Submit - Page Should Contain ${username} - Wait Until Page Contains Element xpath=(//*[@class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary']) ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} - Click Button Create New VNF Type or VNFC Type - Page Should Contain Enter VNF type and VNFC to proceed - Click Button Proceed anyway - Click Button Upload Reference File - Choose File id=inputFile ${reference_file} - Select From List By Value name=templateIdentifier vLB - Sleep ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} - Click Link Template - Click Button Upload Template File - Choose File id=inputFile ${template_file} - Sleep ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} - Click Link Parameter Definition - Click Button UPLOAD PD FILE - Choose File id=inputFile1 ${parameterdefinition_file} - Sleep ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} - Click Link Reference Data - Select From List By Value name=templateIdentifier vLB - Click Button saveToAppc - Go To ${APPC_CDT_LOGIN_URL}#/vnfs - Wait Until Page Contains ${reference_file_name} ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} - Log Logged in to ${APPC_CDT_ENDPOINT} diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index 9137ac09..f2bba38b 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -168,18 +168,6 @@ Get Persona Model Id ${persona_model_id}= Get From DIctionary ${resp.json()['service-instance'][0]} model-invariant-id [Return] ${persona_model_id} -APPC Mount Point - [Arguments] ${vf_module_name} - Run Openstack Auth Request auth - ${status} ${stack_info}= Run Keyword and Ignore Error Wait for Stack to Be Deployed auth ${vf_module_name} timeout=120s - Run Keyword if '${status}' == 'FAIL' FAIL ${vf_module_name} Stack is not found - ${stack_id}= Get From Dictionary ${stack_info} id - ${server_list}= Get Openstack Servers auth - ${vpg_name_0}= Get From Dictionary ${stack_info} vpg_name_0 - ${vnf_id}= Get From Dictionary ${stack_info} vnf_id - ${vpg_public_ip}= Get Server Ip ${server_list} ${stack_info} vpg_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} - ${appc}= Create Mount Point In APPC ${vnf_id} ${vpg_public_ip} - Instantiate VNF [Arguments] ${service} ${vf_module_label}=NULL ${tenant_id} ${tenant_name}= Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone @@ -197,9 +185,6 @@ Instantiate VNF \ ${model_invariant_id}= Set Variable If '${vf_module_label}' in '${vf_module}' ${generic_vnf['model-invariant-id']} ${model_invariant_id} Log Update old vFWCL Policy for ModelInvariantID=${model_invariant_id} ${status} ${value}= Run Keyword And Ignore Error Update vFWCL Operational and Monitoring Policies ${model_invariant_id} - :FOR ${vf_module_name} IN @{vf_module_name_list} - \ Log APPC Mount Point for VNF Module Name=${vf_module_name} - \ ${status} ${value}= Run Keyword And Ignore Error APPC Mount Point ${vf_module_name} Log Update Tca ControlLoopName Update Tca ControlLoopName ${model_invariant_id} @@ -226,7 +211,6 @@ Instantiate Demo VNF \ ${model_invariant_id}= Set Variable If '${vf_module_label}' in '${vf_module}' ${generic_vnf['model-invariant-id']} ${model_invariant_id} Log ModelInvariantID=${model_invariant_id} ${status} ${value}= Run Keyword And Ignore Error Update vFWCL Operational and Monitoring Policies ${model_invariant_id} - ${status} ${value}= Run Keyword And Ignore Error APPC Mount Point ${vf_module_name} Save For Delete [Documentation] Create a variable file to be loaded for save for delete diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot index 3af5164e..5acf82c3 100644 --- a/robot/resources/stack_validation/validate_vfw.robot +++ b/robot/resources/stack_validation/validate_vfw.robot @@ -9,7 +9,6 @@ Resource ../../resources/openstack/nova_interface.robot Resource ../../resources/openstack/heat_interface.robot Resource ../../resources/ssh/files.robot Resource ../../resources/ssh/processes.robot -Resource ../appc_interface.robot Resource packet_generator_interface.robot Resource validate_common.robot @@ -42,7 +41,6 @@ Validate Firewall Stack #Wait For Packet Sink ${vsn_public_ip} #Log All server processes up ${vpg_oam_ip}= Get From Dictionary ${stack_info} vpg_onap_private_ip_0 - ${appc}= Create Mount Point In APPC ${vpg_name_0} ${vpg_oam_ip} #Wait For Packets ${vpg_public_ip} ${vpg_unprotected_ip} ${vsn_protected_ip} ${vsn_public_ip} Wait For Packets diff --git a/robot/resources/test_templates/vnf_instantiation_ovp.robot b/robot/resources/test_templates/vnf_instantiation_ovp.robot index 65ff37c3..71f079b3 100644 --- a/robot/resources/test_templates/vnf_instantiation_ovp.robot +++ b/robot/resources/test_templates/vnf_instantiation_ovp.robot @@ -33,7 +33,6 @@ Instantiate VNF ##### INSTANTIATING VNF IN VID ##### :FOR ${vnf} IN @{vnflist} - # APPC max is 50 characters \ ${vnf_name}= Catenate Ete_${vnf}_${uuid}_${vnf_name_index} \ ${generic_vnf_type}= Set Variable ${service_name}/${vnf_type} ${vnf_name_index} \ ${vnf_name_index}= Evaluate ${vnf_name_index} + 1 diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 9d33f7ab..59eff810 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -60,7 +60,6 @@ Orchestrate VNF ${vf_module_name_list}= Create List ${uuid}= Evaluate str("${uuid}")[:8] :FOR ${vnf} IN @{vnflist} - # APPC max is 50 characters \ ${vnf_name}= Catenate Ete_${vnf}_${uuid}_${vnf_name_index} \ ${vf_module_name}= Catenate Vfmodule_Ete_${vnf}_${uuid}_${vnf_name_index} \ ${vnf_name_index}= Evaluate ${vnf_name_index} + 1 diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot index 14fecfe0..6ec506a3 100644 --- a/robot/testsuites/demo.robot +++ b/robot/testsuites/demo.robot @@ -60,10 +60,6 @@ Preload VNF GRA Set Global Variable ${API_TYPE} GRA_API Preload User Model ${VNF_NAME} ${MODULE_NAME} ${SERVICE} ${SERVICE_INSTANCE_ID} -Create APPC Mount Point - [Tags] APPCMountPointDemo - APPC Mount Point ${MODULE_NAME} - Instantiate VFW [Tags] instantiateVFW Instantiate VNF vFW base_vfw @@ -125,13 +121,6 @@ Delete Instantiated VNF # [Tags] heatbridge # Execute Heatbridge ${HB_STACK} ${HB_VNF} ${HB_SERVICE} ${HB_IPV4_OAM_ADDRESS} -Preload APPC CDT GUI - [Documentation] - ... APPC CDT Preload Demo - [Tags] APPCCDTPreloadDemo - Setup Browser - Preload APPC CDT GUI - Distribute vFWNG CDS Model [Documentation] Distribute vFWNG for CDS [Tags] DistributeVFWNG diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot index ef030f29..bf0aa3f7 100644 --- a/robot/testsuites/health-check.robot +++ b/robot/testsuites/health-check.robot @@ -9,7 +9,6 @@ Resource ../resources/sdnc_interface.robot Resource ../resources/aai/aai_interface.robot Resource ../resources/policy_interface.robot Resource ../resources/sdc_interface.robot -Resource ../resources/appc_interface.robot Resource ../resources/portal_interface.robot Resource ../resources/mr_interface.robot Resource ../resources/bc_interface.robot @@ -50,10 +49,6 @@ Basic AAF SMS Health Check [Tags] health health-aaf Run SMS Health Check -Basic APPC Health Check - [Tags] health-appc - Run APPC Health Check - Basic CLI Health Check [Tags] health-cli health Run CLI Health Check diff --git a/robot/testsuites/update_onap_page.robot b/robot/testsuites/update_onap_page.robot index 709b0d2e..7b1a3b3a 100644 --- a/robot/testsuites/update_onap_page.robot +++ b/robot/testsuites/update_onap_page.robot @@ -30,7 +30,6 @@ Update ONAP Page ${oam_ip_map}= Create Dictionary Set To Dictionary ${oam_ip_map} 10.0.0.1=onapdns Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_AAI_IP_ADDR}=aai1 - Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_APPC_IP_ADDR}=appc Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_DCAE_IP_ADDR}=dcae_controller Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SO_APIHAND_IP_ADDR}=so Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_MR_IP_ADDR}=message_router |