From b451083f7db8144822118613076c05ea8b25898f Mon Sep 17 00:00:00 2001 From: aribeiro Date: Tue, 6 Apr 2021 10:25:20 +0100 Subject: Add service design UI flows Issue-ID: SDC-3558 Signed-off-by: aribeiro Change-Id: I705c38e0b83fdc8f233139c9e06227f5ec251360 --- .../Files/VFCs/1-VFC-NetworkFunction.yaml | 21 ++++++++++++ .../resources/Files/VFCs/2-VFC-NetworkService.yaml | 38 ++++++++++++++++++++++ .../VFCs/org.openecomp.resource.VFC-child.yml | 24 ++++++++++++++ .../Files/VFCs/org.openecomp.resource.VFC-root.yml | 8 +++++ .../importVfc/org.openecomp.resource.VFC-child.yml | 24 -------------- .../importVfc/org.openecomp.resource.VFC-root.yml | 8 ----- .../ci/testSuites/frontend/onapUiSanity.xml | 8 ++++- 7 files changed, 98 insertions(+), 33 deletions(-) create mode 100644 integration-tests/src/test/resources/Files/VFCs/1-VFC-NetworkFunction.yaml create mode 100644 integration-tests/src/test/resources/Files/VFCs/2-VFC-NetworkService.yaml create mode 100644 integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-child.yml create mode 100644 integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-root.yml delete mode 100644 integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-child.yml delete mode 100644 integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-root.yml (limited to 'integration-tests/src/test/resources') diff --git a/integration-tests/src/test/resources/Files/VFCs/1-VFC-NetworkFunction.yaml b/integration-tests/src/test/resources/Files/VFCs/1-VFC-NetworkFunction.yaml new file mode 100644 index 0000000000..7949abfdc4 --- /dev/null +++ b/integration-tests/src/test/resources/Files/VFCs/1-VFC-NetworkFunction.yaml @@ -0,0 +1,21 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 + +node_types: + org.openecomp.resource.MyNetworkFunctionCI: + derived_from: tosca.nodes.Root + properties: + resourceType: + type: string + resourceSubtype: + type: string + required: false + attributes: + atttr_1: + type: string + default: 'Integration Test' + attr_2: + type: integer + default: 2021 + attr_3: + type: boolean + default: true diff --git a/integration-tests/src/test/resources/Files/VFCs/2-VFC-NetworkService.yaml b/integration-tests/src/test/resources/Files/VFCs/2-VFC-NetworkService.yaml new file mode 100644 index 0000000000..6d905c2424 --- /dev/null +++ b/integration-tests/src/test/resources/Files/VFCs/2-VFC-NetworkService.yaml @@ -0,0 +1,38 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 + +node_types: + org.openecomp.resource.MyNetworkServiceCI: + derived_from: org.openecomp.resource.MyNetworkFunctionCI + description: Integration Test Network Service + properties: + resourceType: + type: string + default: 'NetworkService' + nsName: + type: string + nsdId: + type: string + nsDescription: + type: string + subsystemName: + type: string + connectionName: + type: string + tenant: + type: string + vdcName: + type: string + required: false + core_service_ip: + type: string + attributes: + service_ip: + type: string + default: "1.2.3.4" + interfaces: + Standard: + type: tosca.interfaces.node.lifecycle.Standard + create: + implementation: 'camunda/nsCreate' + delete: + implementation: 'camunda/nsDelete' diff --git a/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-child.yml b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-child.yml new file mode 100644 index 0000000000..2c00cbd7e9 --- /dev/null +++ b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-child.yml @@ -0,0 +1,24 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 +node_types: + org.openecomp.resource.VFC-child: + derived_from: org.openecomp.resource.VFC-root + properties: + aProperty: + type: string + required: false + attributes: + test_1: + type: string + default: 'MydefaultValue' + + test_2: + type: integer + default: 266305 + + test_3: + type: string + default: 'TestValue3' + + test_4: + type: boolean + default: true \ No newline at end of file diff --git a/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-root.yml b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-root.yml new file mode 100644 index 0000000000..679f1b64f9 --- /dev/null +++ b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-root.yml @@ -0,0 +1,8 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 +node_types: + org.openecomp.resource.VFC-root: + derived_from: tosca.nodes.Root + properties: + aProperty: + type: string + required: false \ No newline at end of file diff --git a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-child.yml b/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-child.yml deleted file mode 100644 index 2c00cbd7e9..0000000000 --- a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-child.yml +++ /dev/null @@ -1,24 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_3 -node_types: - org.openecomp.resource.VFC-child: - derived_from: org.openecomp.resource.VFC-root - properties: - aProperty: - type: string - required: false - attributes: - test_1: - type: string - default: 'MydefaultValue' - - test_2: - type: integer - default: 266305 - - test_3: - type: string - default: 'TestValue3' - - test_4: - type: boolean - default: true \ No newline at end of file diff --git a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-root.yml b/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-root.yml deleted file mode 100644 index 679f1b64f9..0000000000 --- a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-root.yml +++ /dev/null @@ -1,8 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_3 -node_types: - org.openecomp.resource.VFC-root: - derived_from: tosca.nodes.Root - properties: - aProperty: - type: string - required: false \ No newline at end of file diff --git a/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml index 9a4eab1a8b..cb1370865b 100644 --- a/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml +++ b/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml @@ -11,7 +11,6 @@ - @@ -34,7 +33,14 @@ + + + + + + + -- cgit 1.2.3-korg