diff options
Diffstat (limited to 'integration-tests/src/test/resources')
-rw-r--r-- | integration-tests/src/test/resources/Files/VFCs/1-VFC-NetworkFunction.yaml | 21 | ||||
-rw-r--r-- | integration-tests/src/test/resources/Files/VFCs/2-VFC-NetworkService.yaml | 38 | ||||
-rw-r--r-- | integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-child.yml (renamed from integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-child.yml) | 0 | ||||
-rw-r--r-- | integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-root.yml (renamed from integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-root.yml) | 0 | ||||
-rw-r--r-- | integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml | 8 |
5 files changed, 66 insertions, 1 deletions
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/importVfc/org.openecomp.resource.VFC-child.yml b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-child.yml index 2c00cbd7e9..2c00cbd7e9 100644 --- a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-child.yml +++ b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-child.yml diff --git a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-root.yml b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-root.yml index 679f1b64f9..679f1b64f9 100644 --- a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-root.yml +++ b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-root.yml 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 @@ <include name="changeInstanceNameInVfTest"/> </methods> </class> - <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.ImportVfcUiTest"/> <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.Service"> <methods> <include name="updateService"/> @@ -34,7 +33,14 @@ <include name="onboardEtsiVnfCnfFlow"/> </methods> </class> + <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.ImportVfcUiTest"/> <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.CreateServiceSubstitutionFilterTest"/> + <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.ServiceTemplateDesignUiTests"> + <methods> + <include name="importAndCertifyVfc"/> + <include name="runServiceDesign"/> + </methods> + </class> </classes> </test> </suite> |