From 61663b92910868a4de51c6fe9a7cef7da96da7e9 Mon Sep 17 00:00:00 2001 From: JulienBe Date: Thu, 3 Sep 2020 17:09:46 +0200 Subject: Optimize Build Optimize the log output Issue-ID: SDC-3232 Signed-off-by: JulienBe Change-Id: I50cfb7119b1e9087d3e2db56a81fe47df4ad6254 --- .../sdc/conf/TestAPIConfDependentTest.java | 33 - .../runners/RunTenantIsolationCucumberCI.java | 50 - .../sdc/cucumber/spring/ImportTableConfig.java | 39 - .../steps/PrecannedTestExpectationCallback.java | 50 - .../sdc/cucumber/steps/StepsTenantIsolationCI.java | 606 ------- .../sdc/cucumber/utils/RunnerSession.java | 81 - .../CI/csars/VLANTaggingFromAmdox1303_2018.csar | Bin 46918 -> 0 bytes .../src/test/resources/CI/csars/incorrect_cap.csar | Bin 65844 -> 0 bytes .../src/test/resources/CI/csars/with_groups.csar | Bin 65843 -> 0 bytes .../resources/CI/csars/with_groups_update.csar | Bin 65842 -> 0 bytes .../src/test/resources/CI/csars/without_caps.csar | Bin 65791 -> 0 bytes .../resources/CI/ecomp-error-configuration.yaml | 383 ---- .../src/test/resources/CI/error-configuration.yaml | 1784 ------------------- .../CI/importTypesTest/categoryTypesTest.yml | 23 - .../CI/importTypesTest/categoryTypesTest.zip | Bin 333 -> 0 bytes .../importTypesTest/myHeatStack1/myHeatStack1.yml | 13 - .../importTypesTest/myHeatStack1/myHeatStack1.zip | Bin 400 -> 0 bytes .../importTypesTest/myHeatStack2/myHeatStack2.yml | 14 - .../importTypesTest/myHeatStack2/myHeatStack2.zip | Bin 423 -> 0 bytes .../src/test/resources/CI/other/mapping.json | 182 -- .../addYangXmlArtifactToResource.xml | 32 - .../HeatDeploymentArtifacts/asc_heat 0 2.yaml | 787 -------- .../tests/HeatDeploymentArtifacts/asc_heat 0 2.zip | Bin 2420 -> 0 bytes .../HeatDeploymentArtifacts/asc_heat_net 0 2.yaml | 787 -------- .../tests/HeatDeploymentArtifacts/heatEnvfile.env | 787 -------- .../HeatDeploymentArtifacts/heatInvalidFormat.yaml | 9 - .../tests/HeatDeploymentArtifacts/heat_mini.yaml | 13 - .../tests/HeatDeploymentArtifacts/invalidJson.json | 11 - .../HeatDeploymentArtifacts/invalidYamlFormat.yaml | 787 -------- .../HeatDeploymentArtifacts/invalidYangXml.xml | 35 - .../HeatDeploymentArtifacts/jsonArtifact.json | 22 - .../CI/tests/HeatDeploymentArtifacts/other.txt | 3 - .../bluePrintSampleArtifact.xml | 3 - .../docSampleArtifact.docx | Bin 11307 -> 0 bytes .../emfSampleArtifact.emf | 2 - .../emfSampleArtifact.xml | 3 - .../eventSampleArtifact.xml | 3 - .../jsonSampleArtifact.json | 3 - .../toscaSampleArtifact.yml | 5 - .../asc_heat 0 2.yaml | 787 -------- .../org.openstack.Rally.zip | Bin 11590 -> 0 bytes .../heatWithParamsMissingDefault.yaml | 603 ------- .../heatWithParamsMissingDesc.yaml | 603 ------- .../heatWithParamsMissingType.yaml | 603 ------- .../heatWithValidParams.yaml | 787 -------- .../resources/CI/tests/heatEnv/artifact_1.yaml | 144 -- .../resources/CI/tests/heatEnv/artifact_2.yaml | 469 ----- .../src/test/resources/CI/tests/heatEnv/yuli.yaml | 144 -- .../BindingAsset.yml | 14 - .../CPHasNoReqCap.yml | 9 - .../CPHasNoReqCap_DerivedFromMyCompute1.yml | 9 - .../CPWithAttributes.yml | 56 - .../CaseInsensitiveCapTest_1.yml | 34 - .../CaseInsensitiveCapTest_2.yml | 34 - .../CaseInsensitiveReqTest_1.yml | 34 - .../CaseInsensitiveReqTest_2.yml | 34 - .../DerivedFromCPWithOwnReq.yml | 14 - .../DerivedFromWebApplication_HasNoReqType.yml | 27 - .../DifferentCapFromRoot.yml | 26 - .../DifferentReqAndCap.yml | 34 - .../DifferentReqCapFromCompute1.yml | 22 - .../DifferentReqCapFromCompute2.yml | 25 - .../DifferentReqFromCompute.yml | 32 - .../FatherHasNoReqCap.yml | 9 - .../ListPropertyFalure01.yml | 17 - .../ListPropertyFalure02.yml | 17 - .../ListPropertyFalure03.yml | 17 - .../ListPropertyFalure04.yml | 17 - .../ListPropertyFalure05.yml | 17 - .../ListPropertyFalure06.yml | 17 - .../ListPropertyFalure07.yml | 17 - .../ListPropertyFalure08.yml | 17 - .../ListPropertyFalure09.yml | 17 - .../ListPropertyFalure10.yml | 17 - .../ListPropertyFalure11.yml | 17 - .../ListPropertyFalure12.yml | 17 - .../ListPropertyFalure13.yml | 17 - .../ListPropertyFalure14.yml | 18 - .../ListPropertyFalure15.yml | 19 - .../ListPropertyFalure16.yml | 17 - .../MapPropertyFalure01.yml | 17 - .../MapPropertyFalure02.yml | 17 - .../MapPropertyFalure03.yml | 17 - .../MapPropertyFalure04.yml | 17 - .../MapPropertyFalure05.yml | 17 - .../MapPropertyFalure06.yml | 17 - .../MapPropertyFalure07.yml | 17 - .../MapPropertyFalure08.yml | 17 - .../MapPropertyFalure09.yml | 17 - .../MapPropertyFalure10.yml | 17 - .../MapPropertyFalure11.yml | 17 - .../MapPropertyFalure12.yml | 17 - .../MapPropertyFalure13.yml | 17 - .../MapPropertyFalure14.yml | 18 - .../MapPropertyFalure15.yml | 19 - .../MapPropertyFalure16.yml | 17 - .../MyFatherCompute_NoReqCap.yml | 17 - .../SameCapAsCompute.yml | 26 - .../SameReqAsCompute.yml | 23 - .../SameReqAsCompute_DerivedFromMyCompute1.yml | 23 - .../computeCap11.yml | 35 - .../computeCap1UNBOUNDED.yml | 35 - .../derivedFromMyCompute.yml | 35 - .../derivedFromWebAppDerivedReqCap.yml | 15 - .../importAttributeSuccessFlow.yml | 53 - .../importCapabilityNameExistsOnParent.yml | 35 - .../importDuplicateCapability.yml | 42 - .../importDuplicateRequirements.yml | 40 - .../importListPropertyBadDefault.yml | 17 - .../importListPropertyGoodDefault.yml | 17 - .../importListPropertySuccessFlow.yml | 198 -- .../importMapPropertySuccessFlow.yml | 452 ----- .../importRequirementNameExistsOnParent.yml | 34 - ...entNameExistsOnParent_DerivedFromMyCompute1.yml | 34 - .../missingCapInCapDefinition.yml | 37 - .../missingCapInReqDefinition.yml | 25 - .../myChildCompute_NoReqCap.yml | 17 - .../myChildWebApp_DerivedFromContainer.yml | 15 - .../importToscaResourceByCreateUrl/myCompute.yml | 35 - .../myComputeDerivedFromNotExists.yml | 35 - .../myComputeIncorrectDefenitionVersionValue.yml | 35 - .../myComputeIncorrectNameSpaceFormat.yml | 35 - .../myComputeNoDefenitionVersion.yml | 34 - .../myComputeOccurencySuccess.yml | 77 - .../myComputeParssingFalure.yml | 35 - .../myComputeReqNameExistsOnDerived.yml | 34 - .../importToscaResourceByCreateUrl/myComputeVF.yml | 35 - .../myComputeWithNodeTypesTwice.yml | 42 - .../myComputeWithTopologyTemplate.yml | 44 - .../myFatherWebApp_derviedFromDocker.yml | 16 - .../importToscaResourceByCreateUrl/myLinkVL.yml | 35 - .../importToscaResourceByCreateUrl/myPortCP.yml | 35 - .../importToscaResourceByCreateUrl/noContent.yml | 0 .../occurencyFalure01.yml | 35 - .../occurencyFalure02.yml | 35 - .../occurencyFalure03.yml | 35 - .../occurencyFalure04.yml | 35 - .../occurencyFalure05.yml | 35 - .../occurencyFalure06.yml | 35 - .../occurencyFalure07.yml | 35 - .../occurencyFalure08.yml | 35 - .../occurencyFalure09.yml | 35 - .../occurencyFalure10.yml | 35 - .../occurencyFalure11.yml | 35 - .../occurencyFalure31.yml | 35 - .../occurencyFalure32.yml | 35 - .../occurencyFalure33.yml | 35 - .../occurencyFalure34.yml | 35 - .../occurencyFalure35.yml | 35 - .../occurencyFalure36.yml | 35 - .../occurencyFalure37.yml | 35 - .../occurencyFalure38.yml | 35 - .../occurencyFalure39.yml | 35 - .../occurencyFalure40.yml | 35 - .../occurencyFalure41.yml | 35 - .../softwareComponentReq11.yml | 17 - .../softwareComponentReq12.yml | 17 - .../tests/tenantIsolationCI/aai_error.properties | 10 - .../resources/CI/tests/testCsarAPI/topology.txt | 1 - .../CI/tests/testCsarAPI/topologyTemplate.txt | 1 - .../tests/tmp/positive_artifact_bool10_false.yaml | 140 -- .../tests/tmp/positive_artifact_bool11_false.yaml | 140 -- .../tests/tmp/positive_artifact_bool12_false.yaml | 140 -- .../CI/tests/tmp/positive_artifact_bool1_true.yaml | 140 -- .../CI/tests/tmp/positive_artifact_bool2_true.yaml | 140 -- .../CI/tests/tmp/positive_artifact_bool3_true.yaml | 140 -- .../CI/tests/tmp/positive_artifact_bool4_true.yaml | 140 -- .../CI/tests/tmp/positive_artifact_bool5_true.yaml | 140 -- .../CI/tests/tmp/positive_artifact_bool6_true.yaml | 140 -- .../tests/tmp/positive_artifact_bool7_false.yaml | 140 -- .../tests/tmp/positive_artifact_bool8_false.yaml | 140 -- .../tests/tmp/positive_artifact_bool9_false.yaml | 140 -- .../CI/tests/tmp/positive_artifact_number1.yaml | 140 -- .../CI/tests/tmp/positive_artifact_number2.yaml | 140 -- .../yamlFieldsValidation/artifact_unsupported.yaml | 140 -- .../negative_artifact_bool1.yaml | 140 -- .../negative_artifact_bool2.yaml | 140 -- .../negative_artifact_number1.yaml | 140 -- .../negative_artifact_number2.yaml | 140 -- .../negative_artifact_string1.yaml | 140 -- .../src/test/resources/catalogMgmtTest.properties | 34 - .../src/test/resources/catalogMgmtTest.yaml | 6 - test-apis-ci/src/test/resources/config.json | 12 - .../src/test/resources/config/configuration1.yaml | 17 - .../src/test/resources/config/elasticsearch.yml | 387 ---- .../config/test-apis-ci/DME2preferredRouter.txt | 0 .../config/test-apis-ci/configuration.yaml | 415 ----- .../distribution-engine-configuration.yaml | 77 - .../test-apis-ci/ecomp-error-configuration.yaml | 383 ---- .../config/test-apis-ci/error-configuration.yaml | 1883 -------------------- .../test-apis-ci/neo4j-errors-configuration.yaml | 60 - .../config/test-apis-ci/users-configuration.yaml | 2 - .../resources/cucumber/tenantIsolation.feature | 38 - test-apis-ci/src/test/resources/logback-test.xml | 13 - .../src/test/resources/preferredRouter.txt | 0 195 files changed, 20348 deletions(-) delete mode 100644 test-apis-ci/src/test/java/org/openecomp/sdc/conf/TestAPIConfDependentTest.java delete mode 100644 test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java delete mode 100644 test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/spring/ImportTableConfig.java delete mode 100644 test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java delete mode 100644 test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java delete mode 100644 test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/utils/RunnerSession.java delete mode 100644 test-apis-ci/src/test/resources/CI/csars/VLANTaggingFromAmdox1303_2018.csar delete mode 100644 test-apis-ci/src/test/resources/CI/csars/incorrect_cap.csar delete mode 100644 test-apis-ci/src/test/resources/CI/csars/with_groups.csar delete mode 100644 test-apis-ci/src/test/resources/CI/csars/with_groups_update.csar delete mode 100644 test-apis-ci/src/test/resources/CI/csars/without_caps.csar delete mode 100644 test-apis-ci/src/test/resources/CI/ecomp-error-configuration.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/error-configuration.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.yml delete mode 100644 test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.zip delete mode 100644 test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml delete mode 100644 test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.zip delete mode 100644 test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml delete mode 100644 test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.zip delete mode 100644 test-apis-ci/src/test/resources/CI/other/mapping.json delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/addYangXmlArtifactToResource.xml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat 0 2.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat 0 2.zip delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat_net 0 2.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heatEnvfile.env delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heatInvalidFormat.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heat_mini.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidJson.json delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidYamlFormat.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidYangXml.xml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/jsonArtifact.json delete mode 100644 test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/other.txt delete mode 100644 test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/bluePrintSampleArtifact.xml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/docSampleArtifact.docx delete mode 100644 test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/emfSampleArtifact.emf delete mode 100644 test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/emfSampleArtifact.xml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/eventSampleArtifact.xml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/jsonSampleArtifact.json delete mode 100644 test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/toscaSampleArtifact.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/addHeatArtifactToServiceAndSertify/asc_heat 0 2.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/downloadResourceArtifactSuccess/org.openstack.Rally.zip delete mode 100644 test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingDefault.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingDesc.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingType.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithValidParams.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/heatEnv/artifact_1.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/heatEnv/artifact_2.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/heatEnv/yuli.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/BindingAsset.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPHasNoReqCap.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPHasNoReqCap_DerivedFromMyCompute1.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPWithAttributes.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveCapTest_1.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveCapTest_2.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveReqTest_1.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveReqTest_2.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DerivedFromCPWithOwnReq.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DerivedFromWebApplication_HasNoReqType.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentCapFromRoot.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqAndCap.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqCapFromCompute1.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqCapFromCompute2.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqFromCompute.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/FatherHasNoReqCap.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure01.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure02.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure03.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure04.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure05.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure06.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure07.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure08.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure09.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure10.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure11.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure12.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure13.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure14.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure15.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure16.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure01.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure02.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure03.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure04.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure05.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure06.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure07.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure08.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure09.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure10.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure11.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure12.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure13.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure14.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure15.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure16.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MyFatherCompute_NoReqCap.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameCapAsCompute.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameReqAsCompute.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameReqAsCompute_DerivedFromMyCompute1.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/computeCap11.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/computeCap1UNBOUNDED.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/derivedFromMyCompute.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/derivedFromWebAppDerivedReqCap.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importAttributeSuccessFlow.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importCapabilityNameExistsOnParent.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importDuplicateCapability.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importDuplicateRequirements.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertyBadDefault.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertyGoodDefault.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertySuccessFlow.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importMapPropertySuccessFlow.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importRequirementNameExistsOnParent.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importRequirementNameExistsOnParent_DerivedFromMyCompute1.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/missingCapInCapDefinition.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/missingCapInReqDefinition.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myChildCompute_NoReqCap.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myChildWebApp_DerivedFromContainer.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myCompute.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeDerivedFromNotExists.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeIncorrectDefenitionVersionValue.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeIncorrectNameSpaceFormat.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeNoDefenitionVersion.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeOccurencySuccess.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeParssingFalure.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeReqNameExistsOnDerived.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeVF.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeWithNodeTypesTwice.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeWithTopologyTemplate.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myFatherWebApp_derviedFromDocker.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myLinkVL.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myPortCP.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/noContent.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure01.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure02.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure03.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure04.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure05.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure06.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure07.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure08.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure09.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure10.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure11.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure31.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure32.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure33.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure34.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure35.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure36.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure37.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure38.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure39.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure40.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure41.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/softwareComponentReq11.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/softwareComponentReq12.yml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tenantIsolationCI/aai_error.properties delete mode 100644 test-apis-ci/src/test/resources/CI/tests/testCsarAPI/topology.txt delete mode 100644 test-apis-ci/src/test/resources/CI/tests/testCsarAPI/topologyTemplate.txt delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool10_false.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool11_false.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool12_false.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool1_true.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool2_true.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool3_true.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool4_true.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool5_true.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool6_true.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool7_false.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool8_false.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool9_false.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_number1.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_number2.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/artifact_unsupported.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_bool1.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_bool2.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_number1.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_number2.yaml delete mode 100644 test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_string1.yaml delete mode 100644 test-apis-ci/src/test/resources/catalogMgmtTest.properties delete mode 100644 test-apis-ci/src/test/resources/catalogMgmtTest.yaml delete mode 100644 test-apis-ci/src/test/resources/config.json delete mode 100644 test-apis-ci/src/test/resources/config/configuration1.yaml delete mode 100644 test-apis-ci/src/test/resources/config/elasticsearch.yml delete mode 100644 test-apis-ci/src/test/resources/config/test-apis-ci/DME2preferredRouter.txt delete mode 100644 test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml delete mode 100644 test-apis-ci/src/test/resources/config/test-apis-ci/distribution-engine-configuration.yaml delete mode 100644 test-apis-ci/src/test/resources/config/test-apis-ci/ecomp-error-configuration.yaml delete mode 100644 test-apis-ci/src/test/resources/config/test-apis-ci/error-configuration.yaml delete mode 100644 test-apis-ci/src/test/resources/config/test-apis-ci/neo4j-errors-configuration.yaml delete mode 100644 test-apis-ci/src/test/resources/config/test-apis-ci/users-configuration.yaml delete mode 100644 test-apis-ci/src/test/resources/cucumber/tenantIsolation.feature delete mode 100644 test-apis-ci/src/test/resources/logback-test.xml delete mode 100644 test-apis-ci/src/test/resources/preferredRouter.txt (limited to 'test-apis-ci/src/test') diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/conf/TestAPIConfDependentTest.java b/test-apis-ci/src/test/java/org/openecomp/sdc/conf/TestAPIConfDependentTest.java deleted file mode 100644 index 9e664030af..0000000000 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/conf/TestAPIConfDependentTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.conf; - -import org.junit.BeforeClass; -import org.openecomp.sdc.common.test.BaseConfDependent; - -public class TestAPIConfDependentTest extends BaseConfDependent{ - @BeforeClass - public static void setupBeforeClass() { - componentName = "test-apis-ci"; - confPath = "src/test/resources/config"; - setUp(); - } -} diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java deleted file mode 100644 index 2c9fca2186..0000000000 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java +++ /dev/null @@ -1,50 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.cucumber.runners; - -import io.cucumber.junit.Cucumber; -import io.cucumber.junit.CucumberOptions; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.openecomp.sdc.conf.TestAPIConfDependentTest; - -@RunWith(Cucumber.class) -@CucumberOptions(features = "classpath:cucumber/tenantIsolation.feature", glue = "org.openecomp.sdc.cucumber.steps") - -public class RunTenantIsolationCucumberCI extends TestAPIConfDependentTest { - - @BeforeClass - public static void beforeClass() { - } - - @AfterClass - public static void afterClassJUnit() { - } - - @org.testng.annotations.BeforeClass - public static void beforeClassTestNg() { - } - - @org.testng.annotations.AfterClass - public static void afterClassTestNG() { - } -} diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/spring/ImportTableConfig.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/spring/ImportTableConfig.java deleted file mode 100644 index 275f1032b4..0000000000 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/spring/ImportTableConfig.java +++ /dev/null @@ -1,39 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.cucumber.spring; - -import org.openecomp.sdc.be.dao.cassandra.CassandraClient; -import org.openecomp.sdc.be.dao.cassandra.OperationalEnvironmentDao; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class ImportTableConfig { - @Bean(name = "cassandra-client") - public CassandraClient cassandraClient() { - return new CassandraClient(); - } - - @Bean(name = "operational-environment-dao") - public OperationalEnvironmentDao operationalEnvironmentDao(CassandraClient cassandraClient) { - return new OperationalEnvironmentDao(cassandraClient); - } -} diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java deleted file mode 100644 index 7bd002efda..0000000000 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java +++ /dev/null @@ -1,50 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.cucumber.steps; - -import com.google.common.net.HttpHeaders; -import org.apache.http.entity.ContentType; -import org.mockserver.mock.action.ExpectationCallback; -import org.mockserver.model.Header; -import org.mockserver.model.HttpRequest; -import org.mockserver.model.HttpResponse; - -import static org.mockserver.model.HttpResponse.response; - -public class PrecannedTestExpectationCallback implements ExpectationCallback { - private static volatile int countRequests; - - static HttpResponse httpResponse = response() - .withStatusCode(200) - .withHeaders(new Header(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType())); - - @Override - public HttpResponse handle(HttpRequest httpRequest) { - countRequests++; - - System.out.println( - String.format("MSO Server Simulator Recieved %s Final Distribution Complete Rest Reports From ASDC", - countRequests)); - - return httpResponse; - } - -} diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java deleted file mode 100644 index e19280aa46..0000000000 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java +++ /dev/null @@ -1,606 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.cucumber.steps; - -import com.google.common.base.Strings; -import com.google.common.net.HttpHeaders; -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; -import io.cucumber.java.After; -import io.cucumber.java.Before; -import io.cucumber.java.en.Given; -import io.cucumber.java.en.Then; -import io.cucumber.java.en.When; -import fj.data.Either; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpStatus; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.mockserver.integration.ClientAndServer; -import org.mockserver.model.Header; -import org.mockserver.model.HttpRequest; -import org.openecomp.sdc.api.IDistributionClient; -import org.openecomp.sdc.api.consumer.IConfiguration; -import org.openecomp.sdc.api.consumer.IFinalDistrStatusMessage; -import org.openecomp.sdc.api.consumer.INotificationCallback; -import org.openecomp.sdc.api.notification.IArtifactInfo; -import org.openecomp.sdc.api.notification.INotificationData; -import org.openecomp.sdc.api.results.IDistributionClientDownloadResult; -import org.openecomp.sdc.api.results.IDistributionClientResult; -import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus; -import org.openecomp.sdc.be.dao.cassandra.OperationalEnvironmentDao; -import org.openecomp.sdc.be.datatypes.enums.EnvironmentStatusEnum; -import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry; -import org.openecomp.sdc.common.datastructure.FunctionalInterfaces; -import org.openecomp.sdc.common.datastructure.Wrapper; -import org.openecomp.sdc.cucumber.spring.ImportTableConfig; -import org.openecomp.sdc.http.HttpAsdcClient; -import org.openecomp.sdc.http.HttpAsdcResponse; -import org.openecomp.sdc.http.IHttpAsdcClient; -import org.openecomp.sdc.impl.DistributionClientFactory; -import org.openecomp.sdc.utils.ArtifactTypeEnum; -import org.openecomp.sdc.utils.DistributionActionResultEnum; -import org.openecomp.sdc.utils.DistributionStatusEnum; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.mockserver.model.HttpClassCallback.callback; -import static org.mockserver.model.HttpRequest.request; -import static org.mockserver.model.HttpResponse.response; -import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.retryMethodOnResult; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -//import org.openecomp.sdc.dmaap.DmaapPublisher; - -public class StepsTenantIsolationCI { - - private Map recordMap = new HashMap<>(); - private OperationalEnvironmentDao operationalEnvironmentDao; - private ClientAndServer aaiMockServer; - private ClientAndServer msoMockServer; - private List distributionClients = new ArrayList<>(); - - private List wdFinalStatusSent = new ArrayList<>(); - - private HttpRequest msoHttpRequest; - private List uuidServicesList; - private boolean cleanFlag = true; - private int maxStepWaitTimeMs; - - private List envIds = new ArrayList<>(); - private List envList = new ArrayList<>(); - private String asdcAddress; - private volatile int numberOfFinalDistributionsSentByASDC; - private int numOfArtifactsToDownload; - private volatile int totalNumOfArtifactsToDownload; - private List envNames = new ArrayList<>(Arrays.asList("Apple", "Orange", "Grape", "Pear", "Watermelon", "Bannana", "Cherry", "Coconut", "Fig", "Mango", "Peach", "Pineapple", "Plum", "Strawberries", "Apricot")); - - private static final String AAI_RESPONSE_BODY_FMT = "{\"operational-environment-id\":\"UUID of Operational Environment\"," - + "\"operational-environment-name\":\"Op Env Name\"," + "\"operational-environment-type\":\"ECOMP\"," - + "\"operational-environment-status\":\"Activate\"," + "\"tenant-context\":\"%s\"," - + "\"workload-context\":\"%s\"," + "\"resource-version\":\"1505228226913\"," + "\"relationship-list\":{}}"; - - private static final String AAI_PATH_REGEX = "/aai/v12/cloud-infrastructure/operational-environments/.*"; - - private static final String MSO_PATH_REGEX = "/onap/mso/infra/modelDistributions/v1/distributions/.*"; - - @Before - public void beforeScenario() { - Collections.shuffle(envNames); - aaiMockServer = ClientAndServer.startClientAndServer(1111); - msoMockServer = ClientAndServer.startClientAndServer(1112); - - this.operationalEnvironmentDao = createDaoObj(); - } - - @After - public void afterScenario() { - System.out.println("Cleaning Up After Scenario..."); - aaiMockServer.stop(); - msoMockServer.stop(); - if (cleanFlag) { - envIds.stream().forEach(operationalEnvironmentDao::delete); - } - distributionClients.stream().forEach(IDistributionClient::stop); - System.out.println("Cleaning Up After Scenario Done"); - } - - // ############################# Given - Start ############################# - - @Given("^clean db after test is (.*)$") - public void clean_db_after_test_is(boolean cleanFlag) { - this.cleanFlag = cleanFlag; - } - - @Given("^AAI returns (.*) and aai_body contains (.*) and (.*)$") - public void aai_returns(int retCode, String tenant, String workload) throws Throwable { - String aaiResponseBody = String.format(AAI_RESPONSE_BODY_FMT, tenant, workload); - - setAaiMockServer(aaiResponseBody); - - System.out.println(aaiMockServer.getClass()); - } - - @Given("^MSO-WD Simulators Started with topic name (.*)$") - public void notification_listner_simulators_started(String topicName) throws Throwable { - envList.forEach(env -> { - final IDistributionClient distClientSim = simulateDistributionClientWD(topicName, env); - distributionClients.add(distClientSim); - }); - - } - - @Given("^MSO Final Distribution Simulator is UP$") - public void mso_Final_Distribution_Simulator_is_UP() throws Throwable { - msoHttpRequest = request().withPath(MSO_PATH_REGEX); - msoMockServer.when(msoHttpRequest).forward( - callback().withCallbackClass("org.openecomp.sdc.cucumber.steps.PrecannedTestExpectationCallback")); - } - - @Given("^ASDC Address is (.*)$") - public void asdc_Address_is(String asdcAddress) throws Throwable { - this.asdcAddress = asdcAddress; - - } - - @Given("^ASDC Contains the following services (.*)$") - public void asdc_Contains_the_following_services(String listOfServicesUUID) throws Throwable { - uuidServicesList = Arrays.asList(listOfServicesUUID.split(",")).stream().map(String::trim) - .collect(Collectors.toList()); - - int maxMinWait = uuidServicesList.size() * envIds.size(); - this.maxStepWaitTimeMs = 60000 * maxMinWait; - System.out.println(String.format("Set Max Step Wait Time To: %s Minutes", maxMinWait)); - } - - @Given("^The number of complete environments is (.*)$") - public void the_number_of_complete_environments_is(int envNum) throws Throwable { - - int counter = 1; - while( envNum > envNames.size()){ - envNames.add(String.valueOf(counter)); - counter++; - } - - - for (int i = 0; i < envNum; i++) { - OperationalEnvironmentEntry preSaveEntry = new OperationalEnvironmentEntry(); - - preSaveEntry.setStatus(EnvironmentStatusEnum.COMPLETED); - preSaveEntry.setLastModified(new Date(System.currentTimeMillis())); - - Set uebAdresses = new HashSet<>(); - uebAdresses.add("uebsb92sfdc.it.att.com"); - preSaveEntry.setDmaapUebAddress(uebAdresses); - preSaveEntry.setIsProduction(false); - preSaveEntry.setUebApikey("sSJc5qiBnKy2qrlc"); - preSaveEntry.setUebSecretKey("4ZRPzNJfEUK0sSNBvccd2m7X"); - preSaveEntry.setTenant("TEST"); - preSaveEntry.setEcompWorkloadContext("ECOMP_E2E-IST"); - - // String envId = UUID.randomUUID().toString(); - String envId = envNames.get(i); - preSaveEntry.setEnvironmentId(envId); - envIds.add(envId); - envList.add(preSaveEntry); - operationalEnvironmentDao.save(preSaveEntry); - } - } - - @Given("^The number of artifacts each Simulator downloads from a service is (.*)$") - public void number_of_artifacts_each_simulator_downloads(int numOfArtifactsToDownload) throws Throwable { - this.numOfArtifactsToDownload = numOfArtifactsToDownload; - } - - // ############################# Given - End ############################# - - // ############################# When - Start ############################# - @When("^Distribution Requests are Sent By MSO$") - public void distribution_Requests_are_Sent_By_MSO() throws Throwable { - envList.stream().forEach(this::distributeServiceInEnv); - - } - - @When("^The Number Of Operational Envrinoments that created is (.*) and Records are added with data (.*)$") - public void operational_envrinoments_records_are_added_with_data(int numOfRecords, String recordData) - throws Throwable { - for (int i = 0; i < numOfRecords; i++) { - OperationalEnvironmentEntry preSaveEntry = new OperationalEnvironmentEntry(); - JsonElement root = new JsonParser().parse(recordData); - - String originalStatus = root.getAsJsonObject().get("status").getAsString(); - int delta = root.getAsJsonObject().get("last_modified_delta").getAsInt(); - preSaveEntry.setStatus(EnvironmentStatusEnum.getByName(originalStatus)); - long last_modified = System.currentTimeMillis() + delta * 1000; - preSaveEntry.setLastModified(new Date(last_modified)); - String envId = UUID.randomUUID().toString(); - preSaveEntry.setEnvironmentId(envId); - envIds.add(envId); - // envrionmentIds.add(envId); - operationalEnvironmentDao.save(preSaveEntry); - - } - - } - - // ############################# When - End ############################# - - // ############################# Then - Start ############################# - @Then("^Operational Environment record contains tenant field (.*$)") - public void operational_environment_record_contains_tenant(boolean tenantExist) throws Throwable { - envIds.forEach(envId -> { - validateStringFieldPresent(tenantExist, OperationalEnvironmentEntry::getTenant, envId, - "Tenant is not as expected"); - }); - } - - @Then("^Operational Environment record contains workload field (.*$)") - public void operational_environment_record_contains_workload(boolean workloadExist) throws Throwable { - envIds.forEach(envId -> { - validateStringFieldPresent(workloadExist, OperationalEnvironmentEntry::getEcompWorkloadContext, envId, - "Workload is not as expected"); - }); - } - - @Then("^Operational Environment record contains UEB Address field (.*$)") - public void operational_environment_record_contains_ueb_address(boolean uebAddresExist) throws Throwable { - envIds.forEach(envId -> { - validateStringFieldPresent(uebAddresExist, this::convertUebAddressToList, envId, - "UEB Address is not as expected"); - }); - } - - @Then("^The Number Of Environment is (.*) with status (.*)$") - public void the_Number_Of_Environment_Created_is(int numberOfEnvsCreated, String status) throws Throwable { - // Write code here that turns the phrase above into concrete actions - - retryMethodOnResult(() -> getCurrentEnvironmets(status), envList -> envList.size() == numberOfEnvsCreated, - 40000, 500); - - List environmentsFound = getCurrentEnvironmets(status); - - assertThat(environmentsFound.size(), is(numberOfEnvsCreated)); - - environmentsFound.forEach(env -> recordMap.put(env.getEnvironmentId(), env)); - envList.addAll(environmentsFound); - } - - @Then("^MSO Final Distribution Recieved Correct Number Of Request$") - public void mso_final_distribution_recieved_request() throws Throwable { - int expectedNumberOfRequestsSentByASDC = calculateExcpectedNumberOfDistributionRequets(); - Function resultVerifier = actualStatusList -> actualStatusList >= expectedNumberOfRequestsSentByASDC; - retryMethodOnResult(() -> numberOfFinalDistributionsSentByASDC(expectedNumberOfRequestsSentByASDC), - resultVerifier, maxStepWaitTimeMs, 500); - int actualNumberOfRequestsSentByASDC = numberOfFinalDistributionsSentByASDC(expectedNumberOfRequestsSentByASDC); - assertThat(actualNumberOfRequestsSentByASDC, is(expectedNumberOfRequestsSentByASDC)); - } - - @Then("^All MSO-WD Simulators Sent The Distribution Complete Notifications$") - public void all_mso_wd_simulators_sent_the_distribution_complete_notifications() { - // Wait Watch Dogs To Send Final Distribution - int excpectedNumberOfDistributionCompleteNotifications = calculateExcpectedNumberOfDistributionRequets(); - final Function, Boolean> resultVerifier = actualStatusList -> actualStatusList - .size() == excpectedNumberOfDistributionCompleteNotifications; - retryMethodOnResult(() -> wdFinalStatusSent, resultVerifier, maxStepWaitTimeMs, 500); - assertThat(wdFinalStatusSent.size(), is(excpectedNumberOfDistributionCompleteNotifications)); - } - @Then("^All Artifacts were downloaded by Simulators$") - public void all_artifacts_downloaded() { - // Wait Watch Dogs To Send Final Distribution - int excpectedNumberOfArtifactsToDownload = numOfArtifactsToDownload * envIds.size() * uuidServicesList.size(); - assertThat(totalNumOfArtifactsToDownload, is(excpectedNumberOfArtifactsToDownload)); - } - // ############################# Then - End ############################# - - private List getCurrentEnvironmets(String status) { - Either, CassandraOperationStatus> eitherStatus = operationalEnvironmentDao - .getByEnvironmentsStatus(EnvironmentStatusEnum.getByName(status)); - assertThat(eitherStatus.isLeft(), is(true)); - - List environmentsRetrieved = eitherStatus.left().value(); - - List environmentsFound = environmentsRetrieved.stream() - .filter(env -> envIds.contains(env.getEnvironmentId())).collect(Collectors.toList()); - return environmentsFound; - } - - private int numberOfFinalDistributionsSentByASDC(int expectedNumberOfRequestsSentByASDC) { - final int newVal = msoMockServer.retrieveRecordedRequests(msoHttpRequest).length; - if (newVal != numberOfFinalDistributionsSentByASDC) { - System.out.println(String.format( - "MSO Server Simulator Recieved %s/%s Final Distribution Complete Rest Reports From ASDC", newVal, - expectedNumberOfRequestsSentByASDC)); - numberOfFinalDistributionsSentByASDC = newVal; - } - - return newVal; - } - - private int calculateExcpectedNumberOfDistributionRequets() { - int numberOfDistributionRequests = envList.size() * uuidServicesList.size(); - return numberOfDistributionRequests; - } - - private static OperationalEnvironmentDao createDaoObj() { - AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ImportTableConfig.class); - final OperationalEnvironmentDao openvDao = (OperationalEnvironmentDao) context - .getBean("operational-environment-dao"); - return openvDao; - } - - private OperationalEnvironmentEntry getRecord(String environmentId) { - Either result = operationalEnvironmentDao - .get(environmentId); - return result.isLeft() ? result.left().value() : null; - } - - private void validateStringFieldPresent(boolean fieldExist, - Function getFieldFunc, String envId, String msg) { - OperationalEnvironmentEntry record = recordMap.computeIfAbsent(envId, this::getRecord); - - assertNotNull(record, "Expected DB record was not found"); - - String actualValue = getFieldFunc.apply(record); - - assertEquals(fieldExist, !Strings.isNullOrEmpty(actualValue), msg); - } - - private void setAaiMockServer(String aaiResponseBody) { - HttpRequest httpRequest = request().withMethod("GET").withPath(AAI_PATH_REGEX) - .withHeaders(new Header(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType())); - - aaiMockServer.when(httpRequest) - .respond(response() - .withHeaders(new Header(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType())) - .withBody(aaiResponseBody)); - } - - private IDistributionClient simulateDistributionClientWD(String topicName, OperationalEnvironmentEntry opEnv) { - - IDistributionClient client = DistributionClientFactory.createDistributionClient(); - final IConfiguration buildDistributionClientConfiguration = buildDistributionClientConfiguration(topicName, - opEnv); - IDistributionClientResult initResult = client.init(buildDistributionClientConfiguration, - new INotificationCallback() { - - @Override - public void activateCallback(INotificationData data) { - buildWdSimulatorCallback(opEnv, client, buildDistributionClientConfiguration, data); - - } - - }); - assertThat(initResult.getDistributionActionResult(), is(DistributionActionResultEnum.SUCCESS)); - IDistributionClientResult startResult = client.start(); - assertThat(startResult.getDistributionActionResult(), is(DistributionActionResultEnum.SUCCESS)); - System.out.println(String.format("WD Simulator On Environment:\"%s\" Started Successfully", - buildDistributionClientConfiguration.getConsumerID())); - return client; - } - - private IFinalDistrStatusMessage buildFinalDistribution() { - return new IFinalDistrStatusMessage() { - - @Override - public long getTimestamp() { - return System.currentTimeMillis(); - } - - @Override - public DistributionStatusEnum getStatus() { - return DistributionStatusEnum.DISTRIBUTION_COMPLETE_OK; - } - - @Override - public String getDistributionID() { - return "FakeDistributionId"; - } - }; - } - - private IConfiguration buildDistributionClientConfiguration(String topicName, OperationalEnvironmentEntry opEnv) { - return new IConfiguration() { - - public String getUser() { - return "ci"; - } - - public int getPollingTimeout() { - return 20; - } - - public int getPollingInterval() { - return 20; - } - - public String getPassword() { - return "123456"; - } - - public String getEnvironmentName() { - return topicName; - } - - public String getConsumerID() { - return opEnv.getEnvironmentId(); - } - - public String getConsumerGroup() { - return String.format("BenchMarkDistributionClientConsumerGroup%s", opEnv.getEnvironmentId()); - } - - public String getAsdcAddress() { - return String.format("%s:8443", asdcAddress); - } - - @Override - public String getKeyStorePath() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getKeyStorePassword() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean activateServerTLSAuth() { - // TODO Auto-generated method stub - return false; - } - - @Override - public List getRelevantArtifactTypes() { - return Arrays.asList(ArtifactTypeEnum.values()).stream() - .map(artifactTypeEnum -> artifactTypeEnum.name()).collect(Collectors.toList()); - } - - @Override - public boolean isFilterInEmptyResources() { - // TODO Auto-generated method stub - return false; - } - - @Override - public Boolean isUseHttpsWithDmaap() { - return null; - } - - @Override - public List getMsgBusAddress() { - return opEnv.getDmaapUebAddress().stream().map(this::extractHost).collect(Collectors.toList()); - } - - private String extractHost(String url) { - return url.split(":")[0]; - } - }; - } - - private void distributeServiceInEnv(OperationalEnvironmentEntry env) { - uuidServicesList.stream().forEach(serviceUUID -> distributeSingleService(env, serviceUUID)); - } - - private void distributeSingleService(OperationalEnvironmentEntry env, String serviceUUID) { - IHttpAsdcClient client = new HttpAsdcClient(buildDistributionClientConfiguration(StringUtils.EMPTY, env)); - String pattern = "/sdc/v1/catalog/services/%s/distribution/%s/activate"; - String requestUrl = String.format(pattern, serviceUUID, env.getEnvironmentId()); - String requestBody = String.format("{\"workloadContext\":\"%s\"}", env.getEnvironmentId()); - StringEntity body = new StringEntity(requestBody, ContentType.APPLICATION_JSON); - Map headersMap = new HashMap<>(); - headersMap.put("USER_ID", "cs0008"); - headersMap.put("X-ECOMP-InstanceID", "test"); - headersMap.put("Content-Type", "application/json"); - - HttpAsdcResponse postRequest = FunctionalInterfaces.retryMethodOnResult( - () -> distributeMethod(client, requestUrl, serviceUUID, body, headersMap, env.getEnvironmentId()), - resp -> resp.getStatus() == HttpStatus.SC_ACCEPTED); - assertThat(postRequest.getStatus(), is(HttpStatus.SC_ACCEPTED)); - - } - - private HttpAsdcResponse distributeMethod(IHttpAsdcClient client, String requestUrl, String serviceUUID, - StringEntity body, Map headersMap, String envId) { - - final HttpAsdcResponse postRequest = client.postRequest(requestUrl, body, headersMap); - final String message = String.format( - "MSO Client Simulator Distributes Service:%s On Environment:\"%s\" - Recieved Response: %s", serviceUUID, envId, - postRequest.getStatus()); - if (postRequest.getStatus() != HttpStatus.SC_ACCEPTED) { - System.err.println(message); - } else { - System.out.println(message); - } - - return postRequest; - } - - private String convertUebAddressToList(OperationalEnvironmentEntry op) { - Set dmaapUebAddress = op.getDmaapUebAddress(); - Wrapper resultWrapper = new Wrapper<>(StringUtils.EMPTY); - if (!CollectionUtils.isEmpty(dmaapUebAddress)) { - dmaapUebAddress.stream() - .forEach(uebAddress -> resultWrapper.setInnerElement(resultWrapper.getInnerElement() + uebAddress)); - } - - return resultWrapper.getInnerElement(); - } - - private void buildWdSimulatorCallback(OperationalEnvironmentEntry opEnv, IDistributionClient client, - final IConfiguration buildDistributionClientConfiguration, INotificationData data) { - if (StringUtils.equals(data.getWorkloadContext(), opEnv.getEnvironmentId())) { - - final String expectedArtifactType = org.openecomp.sdc.common.api.ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.name(); - Optional optional = data.getServiceArtifacts().stream().filter( artifact -> { - return StringUtils.equals(artifact.getArtifactType(), expectedArtifactType); - }).findAny(); - - for (int i = 0; i < numOfArtifactsToDownload; i++) { - optional.ifPresent( artifactInfo -> simulateDownload(client , artifactInfo, data) ); - optional.orElseThrow( () -> handleArtifactNotFound(expectedArtifactType, data)); - - } - if( numOfArtifactsToDownload > 0 ){ - System.out.println(String.format( - "ASDC Consumer Simulator On Environment:\"%s\" Downloaded %s Artifacts From ASDC Service with UUID:%s Total Artifacts Downloaded from ASDC is: %s", - data.getWorkloadContext(), numOfArtifactsToDownload, - data.getServiceUUID(), totalNumOfArtifactsToDownload)); - } - - IDistributionClientResult finalDistrStatus = client.sendFinalDistrStatus(buildFinalDistribution()); - assertThat(finalDistrStatus.getDistributionActionResult(), is(DistributionActionResultEnum.SUCCESS)); - wdFinalStatusSent.add(data.getWorkloadContext()); - - System.out.println(String.format( - "WD Simulator On Environment:\"%s\" Recieved Notification From ASDC On WorkLoad: %s And Service UUID:%s And Sends Distribution Complete Notification", - buildDistributionClientConfiguration.getConsumerID(), data.getWorkloadContext(), - data.getServiceUUID())); - } - } - - private IllegalStateException handleArtifactNotFound(String expectedArtifactType, INotificationData data ){ - final String stringMessage = String.format("Did Not Find Artifact of type: %s to download from service with UUID:%s", expectedArtifactType, data.getServiceUUID()); - System.err.println(stringMessage); - return new IllegalStateException(stringMessage); - - } - - private void simulateDownload(IDistributionClient client, IArtifactInfo info, INotificationData data){ - IDistributionClientDownloadResult downloadResult = client.download(info); - if( downloadResult.getDistributionActionResult() != DistributionActionResultEnum.SUCCESS ){ - System.err.println(String.format("Client Simulator %s Failed to download artifact from service : %s", client.getConfiguration().getConsumerID(), data.getServiceUUID())); - assertThat(downloadResult.getDistributionActionResult(), is(DistributionActionResultEnum.SUCCESS)); - } - else{ - totalNumOfArtifactsToDownload++; - - } - } -} diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/utils/RunnerSession.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/utils/RunnerSession.java deleted file mode 100644 index 9c0bdf79a5..0000000000 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/utils/RunnerSession.java +++ /dev/null @@ -1,81 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdc.cucumber.utils; - -import java.util.HashMap; -import java.util.Map; - -/** - * Store Data here that is relevant for the whole runner and not just a single scenario. - * @author ms172g - * - */ -public class RunnerSession { - private static final RunnerSession instance = new RunnerSession(); - private Map stringElements; - private Map intElements; - private Map elements; - private RunnerSession(){ - stringElements = new HashMap<>(); - intElements = new HashMap<>(); - elements = new HashMap<>(); - } - public static RunnerSession getSession(){ - return instance; - } - - public void putInSession(String key, String value){ - stringElements.put(key, value); - } - - public String getString(String key){ - return stringElements.get(key); - - } - - public void putInSession(String key, Integer value){ - intElements.put(key, value); - } - - - public Integer getInt(String key){ - return intElements.get(key); - } - - public void putInSession(String key, Object value) { - elements.put(key, value); - - } - - public Object get(String key){ - return elements.get(key); - } - - public void clean(){ - intElements.clear(); - stringElements.clear(); - } - - - - - -} diff --git a/test-apis-ci/src/test/resources/CI/csars/VLANTaggingFromAmdox1303_2018.csar b/test-apis-ci/src/test/resources/CI/csars/VLANTaggingFromAmdox1303_2018.csar deleted file mode 100644 index 6c14b1fcd5..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/csars/VLANTaggingFromAmdox1303_2018.csar and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/csars/incorrect_cap.csar b/test-apis-ci/src/test/resources/CI/csars/incorrect_cap.csar deleted file mode 100644 index 506eb851bf..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/csars/incorrect_cap.csar and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/csars/with_groups.csar b/test-apis-ci/src/test/resources/CI/csars/with_groups.csar deleted file mode 100644 index d344ed2d55..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/csars/with_groups.csar and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/csars/with_groups_update.csar b/test-apis-ci/src/test/resources/CI/csars/with_groups_update.csar deleted file mode 100644 index c813d814b6..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/csars/with_groups_update.csar and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/csars/without_caps.csar b/test-apis-ci/src/test/resources/CI/csars/without_caps.csar deleted file mode 100644 index 3ffb8643e1..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/csars/without_caps.csar and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/ecomp-error-configuration.yaml b/test-apis-ci/src/test/resources/CI/ecomp-error-configuration.yaml deleted file mode 100644 index 9d7cd74a2b..0000000000 --- a/test-apis-ci/src/test/resources/CI/ecomp-error-configuration.yaml +++ /dev/null @@ -1,383 +0,0 @@ -########################################### -# Note the conventions of the field values: -# type can be one of: CONFIG_ERROR, SYSTEM_ERROR, DATA_ERROR, CONNECTION_PROBLEM, AUTHENTICATION_PROBLEM -# severity can be one of: WARN, ERROR, FATAL -# alarmSeverity can be one of: CRITICAL,MAJOR,MINOR,INFORMATIONAL,NONE -# code is a unique integer in range of 3003-9999 (3000-3002 are occupied for internal usage) -# The above enumeration values are out-of-the-box and can be changed in code. -# In case of config and code mismatch, the appropriate error will be printed to log -# -## Range of BE codes - 3010-7999 - -errors: - - BeRestApiGeneralError: { - type: SYSTEM_ERROR, - code: ASDC_4000, - severity: ERROR, - description: "Unexpected error during BE REST API execution", - alarmSeverity: CRITICAL - } - - BeHealthCheckError: { - type: SYSTEM_ERROR, - code: ASDC_3010, - severity: ERROR, - description: "Error during BE Health Check", - alarmSeverity: CRITICAL - } - - BeInitializationError: { - type: SYSTEM_ERROR, - code: ASDC_4019, - severity: ERROR, - description: "Catalog-BE was not initialized properly", - alarmSeverity: CRITICAL - } - - BeResourceMissingError: { - type: SYSTEM_ERROR, - code: ASDC_3011, - severity: ERROR, - description: "Mandatory resource %s cannot be found in repository", - alarmSeverity: MAJOR - } - - BeServiceMissingError: { - type: SYSTEM_ERROR, - code: ASDC_3012, - severity: ERROR, - description: "Mandatory service %s cannot be found in repository", - alarmSeverity: MAJOR - } - - BeFailedAddingResourceInstanceError: { - type: SYSTEM_ERROR, - code: ASDC_3013, - severity: ERROR, - description: "Failed to add resource instance of resource %s to service %s", - alarmSeverity: MAJOR - } - - BeIncorrectServiceError: { - type: SYSTEM_ERROR, - code: ASDC_3014, - severity: ERROR, - description: "Service %s is not valid", - alarmSeverity: MAJOR - } - - BeRepositoryDeleteError: { - type: SYSTEM_ERROR, - code: ASDC_3015, - severity: ERROR, - description: "Failed to delete object %s from repository", - alarmSeverity: CRITICAL - } - - BeRepositoryQueryError: { - type: SYSTEM_ERROR, - code: ASDC_3016, - severity: ERROR, - description: "Failed to fetch from repository %s", - alarmSeverity: MAJOR - } - - BeInvalidConfigurationError: { - type: CONFIG_ERROR, - code: ASDC_3017, - severity: FATAL, - description: "Configuration parameter %s is invalid. Value configured is %s", - alarmSeverity: MAJOR - } - - BeUebConnectionError: { - type: CONNECTION_PROBLEM, - code: ASDC_4001, - severity: ERROR, - description: "Connection problem towards U-EB server. Reason: %s", - alarmSeverity: MAJOR - } - - BeUebSystemError: { - type: SYSTEM_ERROR, - code: ASDC_3019, - severity: ERROR, - description: "Error occured during access to U-EB Server. Operation: %s", - alarmSeverity: MAJOR - } - - BeUebObjectNotFoundError: { - type: DATA_ERROR, - code: ASDC_4005, - severity: ERROR, - description: "Error occured during access to U-EB Server. Data not found: %s", - alarmSeverity: MAJOR - } - - BeDistributionEngineSystemError: { - type: SYSTEM_ERROR, - code: ASDC_3021, - severity: ERROR, - description: "Error occured in Distribution Engine. Failed operation: %s", - alarmSeverity: MAJOR - } - - BeUebAuthenticationError: { - type: AUTHENTICATION_PROBLEM, - code: ASDC_4003, - severity: ERROR, - description: "Authentication problem towards U-EB server. Reason: %s", - alarmSeverity: MAJOR - } - - BeUebUnkownHostError: { - type: CONNECTION_PROBLEM, - code: ASDC_4002, - severity: ERROR, - description: "Connection problem towards U-EB server. Cannot reach host %s", - alarmSeverity: MAJOR - } - - BeDistributionEngineInvalidArtifactType: { - type: DATA_ERROR, - code: ASDC_4006, - severity: WARN, - description: "The artifact type %s does not appear in the list of valid artifacts %s", - alarmSeverity: MAJOR - } - BeInvalidTypeError: { - type: DATA_ERROR, - code: ASDC_4008, - severity: WARN, - description: "The type %s of %s is invalid", - alarmSeverity: MAJOR - } - BeInvalidValueError: { - type: DATA_ERROR, - code: ASDC_3028, - severity: WARN, - description: "The value %s of %s from type %s is invalid", - alarmSeverity: MAJOR - } - - BeFailedDeletingResourceInstanceError: { - type: SYSTEM_ERROR, - code: ASDC_3029, - severity: ERROR, - description: "Failed to delete resource instance %s from service %s", - alarmSeverity: MAJOR - } - - BeMissingConfigurationError: { - type: CONFIG_ERROR, - code: ASDC_3030, - severity: FATAL, - description: "Configuration parameter %s is missing", - alarmSeverity: MAJOR - } - - BeConfigurationInvalidListSizeError: { - type: CONFIG_ERROR, - code: ASDC_3031, - severity: FATAL, - description: "Configuration parameter %s is invalid. At least %s values shall be configured", - alarmSeverity: MAJOR - } - - ErrorConfigFileFormat: { - type: CONFIG_ERROR, - code: ASDC_3032, - severity: ERROR, - description: "Error element not found in YAML name: %s", - alarmSeverity: MAJOR - } - - BeMissingArtifactInformationError: { - type: DATA_ERROR, - code: ASDC_4010, - severity: ERROR, - description: "Artifact uploaded has missing information. Missing %s", - alarmSeverity: MAJOR - } - - BeArtifactMissingError: { - type: DATA_ERROR, - code: ASDC_4011, - severity: ERROR, - description: "Artifact %s requested is not found", - alarmSeverity: MAJOR - } - - BeArtifactPayloadInvalid: { - type: DATA_ERROR, - code: ASDC_4012, - severity: ERROR, - description: "Payload of artifact uploaded is invalid (invalid MD5 or encryption)", - alarmSeverity: MAJOR - } - - BeUserMissingError: { - type: DATA_ERROR, - code: ASDC_4009, - severity: ERROR, - description: "User %s requested is not found", - alarmSeverity: MAJOR - } - - BeArtifactInformationInvalidError: { - type: DATA_ERROR, - code: ASDC_4013, - severity: ERROR, - description: "Input for artifact metadata is invalid", - alarmSeverity: MAJOR - } - BeFailedAddingCapabilityTypeError: { - type: DATA_ERROR, - code: ASDC_4015, - severity: ERROR, - description: "Failed adding capability type", - alarmSeverity: CRITICAL - } - - BeCapabilityTypeMissingError: { - type: DATA_ERROR, - code: ASDC_4016, - severity: ERROR, - description: "Capability Type %s not found", - alarmSeverity: CRITICAL - } - - BeInterfaceMissingError: { - type: DATA_ERROR, - code: ASDC_4020, - severity: ERROR, - description: "Interface %s required is missing", - alarmSeverity: MAJOR - } - - BeDaoSystemError: { - type: SYSTEM_ERROR, - code: ASDC_4014, - severity: ERROR, - description: "Operation towards database failed", - alarmSeverity: CRITICAL - } - - BeSystemError: { - type: SYSTEM_ERROR, - code: ASDC_4017, - severity: ERROR, - description: "Unexpected error during operation", - alarmSeverity: CRITICAL - } - - BeFailedLockObjectError: { - type: SYSTEM_ERROR, - code: ASDC_4007, - severity: WARN, - description: "Failed to lock object for update", - alarmSeverity: CRITICAL - } - - BeInvalidJsonInput: { - type: SYSTEM_ERROR, - code: ASDC_4018, - severity: ERROR, - description: "Failed to convert json input to object", - alarmSeverity: MAJOR - } - - BeDistributionMissingError: { - type: DATA_ERROR, - code: ASDC_4021, - severity: ERROR, - description: "Distribution %s required is missing", - alarmSeverity: MAJOR - } - - BeHealthCheckRecovery: { - type: RECOVERY, - code: ASDC_4022, - severity: INFO, - description: "BE Health Check Recovery", - alarmSeverity: INFORMATIONAL - } - BeFailedCreateNodeError: { - type: DATA_ERROR, - code: ASDC_6000, - severity: ERROR, - description: "Failed to create node %s on graph. status is %s", - alarmSeverity: MAJOR - } - BeFailedUpdateNodeError: { - type: DATA_ERROR, - code: ASDC_6001, - severity: ERROR, - description: "Failed to update node %s on graph. Status is %s", - alarmSeverity: MAJOR - } - - BeFailedDeleteNodeError: { - type: DATA_ERROR, - code: ASDC_6002, - severity: ERROR, - description: "Failed to delete node %s on graph. Status is %s", - alarmSeverity: MAJOR - } - - BeFailedRetrieveNodeError: { - type: DATA_ERROR, - code: ASDC_6003, - severity: ERROR, - description: "Failed to retrieve node %s from graph. Status is %s", - alarmSeverity: MAJOR - } - - BeExecuteRollbackError: { - type: DATA_ERROR, - code: ASDC_6004, - severity: ERROR, - description: "Going to execute rollback on graph.", - alarmSeverity: MAJOR - } - - BeFailedFindParentError: { - type: DATA_ERROR, - code: ASDC_6005, - severity: ERROR, - description: "Failed to find parent node %s on graph. Status is %s", - alarmSeverity: MAJOR - } - - BeFailedFindAllNodesError: { - type: DATA_ERROR, - code: ASDC_6006, - severity: ERROR, - description: "Failed to fetch all nodes with type %s of parent node %s . Status is %s", - alarmSeverity: MAJOR - } - - BeFailedFindAssociationError: { - type: DATA_ERROR, - code: ASDC_6007, - severity: ERROR, - description: "Cannot find node with type %s associated with node %s . Status is %s", - alarmSeverity: MAJOR - } - - BeFailedFindAssociationError: { - type: DATA_ERROR, - code: ASDC_6008, - severity: ERROR, - description: "Cannot find node with type %s associated with node %s . Status is %s", - alarmSeverity: MAJOR - } - BeComponentCleanerSystemError: { - type: SYSTEM_ERROR, - code: ASDC_6009, - severity: ERROR, - description: "Error occured in Component Cleaner Task. Failed operation: %s", - alarmSeverity: MAJOR - } - \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/error-configuration.yaml b/test-apis-ci/src/test/resources/CI/error-configuration.yaml deleted file mode 100644 index 7fc65221aa..0000000000 --- a/test-apis-ci/src/test/resources/CI/error-configuration.yaml +++ /dev/null @@ -1,1784 +0,0 @@ -# Errors -errors: - OK: { - code: 200, - message: "OK" - } - CREATED: { - code: 201, - message: "OK" - } - NO_CONTENT: { - code: 204, - message: "No Content" - } -#--------POL4050----------------------------- - NOT_ALLOWED: { - code: 405, - message: "Error: Method not allowed.", - messageId: "POL4050" - } -#--------POL5000----------------------------- - GENERAL_ERROR: { - code: 500, - message: "Error: Internal Server Error. Please try again later.", - messageId: "POL5000" - } -#---------POL5001------------------------------ - MISSING_X_ECOMP_INSTANCE_ID: { - code: 400 , - message: "Error: Missing 'X-ECOMP-InstanceID' HTTP header.", - messageId: "POL5001" - } -#---------POL5002------------------------------ - AUTH_REQUIRED: { - code: 401 , - message: "Error: Authentication is required to use the API.", - messageId: "POL5002" - } -#---------POL5003------------------------------ - AUTH_FAILED: { - code: 403 , - message: "Error: Not authorized to use the API.", - messageId: "POL5003" - } -#---------POL5004------------------------------ - MISSING_USER_ID: { - code: 400 , - message: "Error: Missing 'USER_ID' HTTP header.", - messageId: "POL5004" - } -#---------SVC4000----------------------------- - INVALID_CONTENT: { - code: 400, - message: "Error: Invalid content.", - messageId: "SVC4000" - } -#---------SVC4002----------------------------- - MISSING_INFORMATION: { - code: 403, - message: "Error: Missing information.", - messageId: "SVC4002" - } -#---------SVC4003------------------------------ -# %1 - Users's ID - USER_NOT_FOUND: { - code: 404, - message: "Error: User '%1' was not found.", - messageId: "SVC4003" - } -#---------SVC4004----------------------------- -# %1 - Users's email address - INVALID_EMAIL_ADDRESS: { - code: 400, - message: "Error: Invalid email address '%1'.", - messageId: "SVC4004" - } -#---------SVC4005------------------------------ -# %1 - role - INVALID_ROLE: { - code: 400, - message: "Error: Invalid role '%1'.", - messageId: "SVC4005" - } -#---------SVC4006------------------------------ -# %1 - Users's USER_ID - USER_ALREADY_EXIST: { - code: 409, - message: "Error: User with '%1' ID already exists.", - messageId: "SVC4006" - } -#---------SVC4007------------------------------ - DELETE_USER_ADMIN_CONFLICT: { - code: 409, - message: "Error: An administrator can only be deleted by another administrator.", - messageId: "SVC4007" - } -#---------SVC4008----------------------------- -# %1 - Users's userId - INVALID_USER_ID: { - code: 400, - message: "Error: Invalid userId '%1'.", - messageId: "SVC4008" - } -#---------SVC4049------------------------------ -# %1 - service/resource - COMPONENT_MISSING_CONTACT: { - code: 400, - message: "Error: Invalid Content. Missing %1 contact.", - messageId: "SVC4049" - } -#---------SVC4050----------------------------- -# %1 - Service/Resource/Additional parameter -# %2 - service/resource/label name - COMPONENT_NAME_ALREADY_EXIST: { - code: 409, - message: "Error: %1 with name '%2' already exists.", - messageId: "SVC4050" - } -#---------SVC4051------------------------------ -# %1 - resource/service - COMPONENT_MISSING_CATEGORY: { - code: 400, - message: "Error: Invalid Content. Missing %1 category.", - messageId: "SVC4051" - } - -#---------SVC4052------------------------------ - COMPONENT_MISSING_TAGS: { - code: 400, - message: "Error: Invalid Content. At least one tag has to be specified.", - messageId: "SVC4052" - } - -#---------SVC4053------------------------------ -# %1 - service/resource - COMPONENT_MISSING_DESCRIPTION: { - code: 400, - message: "Error: Invalid Content. Missing %1 description.", - messageId: "SVC4053" - } -#---------SVC4054------------------------------ -# %1 - resource/service - COMPONENT_INVALID_CATEGORY: { - code: 400, - message: "Error: Invalid Content. Value %1 for the field Category is invalid.", - messageId: "SVC4054" - } -#---------SVC4055------------------------------ - MISSING_VENDOR_NAME: { - code: 400, - message: "Error: Invalid Content. Missing vendor name.", - messageId: "SVC4055" - } -#---------SVC4056------------------------------ - MISSING_VENDOR_RELEASE: { - code: 400, - message: "Error: Invalid Content. Missing vendor release.", - messageId: "SVC4056" - } - -#---------SVC4057------------------------------ - MISSING_DERIVED_FROM_TEMPLATE: { - code: 400, - message: "Error: Invalid Content. Missing derived from template specification.", - messageId: "SVC4057" - } - -#---------SVC4058------------------------------ -# %1 - service/resource - COMPONENT_MISSING_ICON: { - code: 400, - message: "Error: Invalid Content. Missing %1 icon.", - messageId: "SVC4058" - } -#---------SVC4059------------------------------ -# %1 - service/resource - COMPONENT_INVALID_ICON: { - code: 400, - message: "Error: Invalid Content. Invalid %1 icon.", - messageId: "SVC4059" - } -#---------SVC4060------------------------------ - PARENT_RESOURCE_NOT_FOUND: { - code: 400, - message: "Error: Invalid Content. Derived from resource template was not found.", - messageId: "SVC4060" - } -#---------SVC4061------------------------------ - MULTIPLE_PARENT_RESOURCE_FOUND: { - code: 400, - message: "Error: Invalid Content. Multiple derived from resource template is not allowed.", - messageId: "SVC4061" - } - -#---------SVC4062------------------------------ -# %1 - service/resource - MISSING_COMPONENT_NAME: { - code: 400, - message: "Error: Invalid Content. Missing %1 name.", - messageId: "SVC4062" - } -#---------SVC4063------------------------------ - #%1  -  resource/service name - RESOURCE_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' resource was not found.", - messageId: "SVC4063" - } - -#---------SVC4064------------------------------ -# %1 - Service/Resource/Property - COMPONENT_INVALID_DESCRIPTION: { - code: 400, - message: "Error: Invalid Content. %1 description contains non-english characters.", - messageId: "SVC4064" - } -#---------SVC4065------------------------------ -# %1 - Service/Resource/Property -# %2 - max resource/service name length - COMPONENT_DESCRIPTION_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. %1 description exceeds limit of %2 characters.", - messageId: "SVC4065" - } -#---------SVC4066------------------------------ -# %1 - max length - COMPONENT_TAGS_EXCEED_LIMIT: { - code: 400, - message: "Error: Invalid Content. Tags overall length exceeds limit of %1 characters.", - messageId: "SVC4066" - } -#---------SVC4067------------------------------ -# %1 - max length - VENDOR_NAME_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Vendor name exceeds limit of %1 characters.", - messageId: "SVC4067" - } -#---------SVC4068------------------------------ -# %1 - max length - VENDOR_RELEASE_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Vendor release exceeds limit of %1 characters.", - messageId: "SVC4068" - } - -#---------SVC4069------------------------------ -# %1 - Service/Resource/Product - COMPONENT_INVALID_CONTACT: { - code: 400, - message: "Error: Invalid Content. %1 Contact Id should be in format 'mnnnnnn' or 'aannna' or 'aannnn', where m=m ,a=a-zA-Z and n=0-9", - messageId: "SVC4069" - } -#---------SVC4070------------------------------ -# %1 - Service/Resource - INVALID_COMPONENT_NAME: { - code: 400, - message: 'Error: Invalid Content. Value %1 for Component name is invalid. Only alphanumeric characters and regular spaces are allowed.', - messageId: "SVC4070" - } - -#---------SVC4071------------------------------ - INVALID_VENDOR_NAME: { - code: 400, - message: 'Error: Invalid Content. Value %1 for the field Vendor name is invalid. Only alphanumeric characters and regular spaces are allowed.', - messageId: "SVC4071" - } -#---------SVC4072------------------------------ - INVALID_VENDOR_RELEASE: { - code: 400, - message: 'Error: Invalid Content. Value %1 for the field Vendor release is invalid. Only alphanumeric characters and regular spaces are allowed.', - messageId: "SVC4072" - } -#---------SVC4073------------------------------ -# %1 - Service/Resource -# %2 - max resource/service name - COMPONENT_NAME_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. %1 name exceeds limit of %2 characters.", - messageId: "SVC4073" - } -#---------SVC4080------------------------------ -# %1 - resource/service name -# %2 - resource/service -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_IN_CHECKOUT_STATE: { - code: 403, - message: "Error: Requested '%1' %2 is locked for modification by %3 %4(%5).", - messageId: "SVC4080" - } -#---------SVC4081----------------------------- -# %1 - resource/service name -# %2 - resource/service -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_IN_CERT_IN_PROGRESS_STATE: { - code: 403, - message: "Error: Requested '%1' %2 is locked for certification by %3 %4(%5).", - messageId: "SVC4081" - } - -#-----------SVC4082--------------------------- -# %1 - resource/service name -# %2 - resource/service -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_SENT_FOR_CERTIFICATION: { - code: 403, - message: "Error: Requested '%1' %2 is sent for certification by %3 %4(%5).", - messageId: "SVC4082" - } -#-----------SVC4083--------------------------- - COMPONENT_VERSION_ALREADY_EXIST: { - code: 409, - message: "Error: Version of this %1 was already promoted.", - messageId: "SVC4083" - } -#-----------SVC4084--------------------------- -# %1 - resource/service/product name -# %2 - resource/service/product -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_ALREADY_CHECKED_IN: { - code: 409, - message: "Error: The current version of '%1' %2 was already checked-in by %3 %4(%5).", - messageId: "SVC4084" - } -#-----------SVC4085--------------------------- -# %1 - resource/service/product name -# %2 - resource/service/product -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_CHECKOUT_BY_ANOTHER_USER: { - code: 403, - message: "Error: %1 %2 has already been checked out by %3 %4(%5).", - messageId: "SVC4085" - } -#-----------SVC4086--------------------------- -# %1  - resource/service name -# %2  - resource/service - COMPONENT_IN_USE: { - code: 403, - message: "Error: Requested '%1' %2 is in use by another user.", - messageId: "SVC4086" - } -#-----------SVC4087--------------------------- -# %1 - component name -# %2 - resource/service/product - COMPONENT_HAS_NEWER_VERSION: { - code: 409, - message: "Error: Checking out of the requested version of the '%1' %2 is not allowed as a newer version exists.", - messageId: "SVC4087" - } -#-----------SVC4088--------------------------- -# %1 - resource/service name -# %2 - resource/service -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_ALREADY_CERTIFIED: { - code: 403, - message: "Error: Requested %1 %2 has already been certified by %3 %4(%5).", - messageId: "SVC4088" - } -#-----------SVC4089--------------------------- -# %1 - resource/service name -# %2 - resource/service - COMPONENT_NOT_READY_FOR_CERTIFICATION: { - code: 403, - message: "Error: Requested '%1' %2 is not ready for certification.", - messageId: "SVC4089" - } -#-----------SVC4100--------------------------- -#%1 - property name - PROPERTY_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' property was not found.", - messageId: "SVC4100" - } -#-----------SVC4101--------------------------- -#%1 - property name - PROPERTY_ALREADY_EXIST: { - code: 409, - message: "Error: Property with '%1' name already exists.", - messageId: "SVC4101" - } - -#-----------SVC4102--------------------------- -# %1 - capability type name - CAPABILITY_TYPE_ALREADY_EXIST: { - code: 409, - message: "Error: Capability Type with name '%1' already exists.", - messageId: "SVC4102" - } -#-----------SVC4114--------------------------- - AUTH_FAILED_INVALIDE_HEADER: { - code: 400, - message: "Error: Invalid Authorization header.", - messageId: "SVC4114" - } -#-----------SVC4115--------------------------- -# %1 - capability type name - MISSING_CAPABILITY_TYPE: { - code: 400, - message: "Error: Invalid Content. Missing Capability Type '%1'.", - messageId: "SVC4115" - } - RESOURCE_INSTANCE_BAD_REQUEST: { - code: 400, - message: "Error: Invalid Content.", - messageId: "SVC4116" - } -#-----------SVC4117--------------------------- -# %1 - resource instance name -# %2 - resource instance name -# %3 - requirement name - RESOURCE_INSTANCE_MATCH_NOT_FOUND: { - code: 404, - message: "Error: Match not found between resource instance '%1' and resource instance '%2' for requirement '%3'.", - messageId: "SVC4117" - } -#-----------SVC4118--------------------------- -# %1 - resource instance name -# %2 - resource instance name -# %3 - requirement name - RESOURCE_INSTANCE_ALREADY_EXIST: { - code: 409, - message: "Error: Resource instances '%1' and '%2' are already associated with requirement '%3'.", - messageId: "SVC4118" - } -#-----------SVC4119--------------------------- -# %1 - resource instance name -# %2 - resource instance name -# %3 - requirement name - RESOURCE_INSTANCE_RELATION_NOT_FOUND: { - code: 404, - message: "Error: No relation found between resource instances '%1' and '%2' for requirement '%3'.", - messageId: "SVC4119" - } -#-----------SVC4120--------------------------- -# %1 - User's USER_ID - USER_INACTIVE: { - code: 404, - message: "Error: User %1 was not found.", - messageId: "SVC4120" - } -#-----------SVC4121--------------------------- -# %1 - User's USER_ID - USER_HAS_ACTIVE_ELEMENTS: { - code: 403, - message: "Error: User with %1 ID can not be deleted since it has active elements(resources/services/artifacts).", - messageId: "SVC4121" - } -#-----------SVC4122--------------------------- -# %1 - artifact type - ARTIFACT_TYPE_NOT_SUPPORTED: { - code: 400, - message: "Error: Invalid artifact type '%1'.", - messageId: "SVC4122" - } -#-----------SVC4123--------------------------- - ARTIFACT_LOGICAL_NAME_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Artifact logical name cannot be changed.", - messageId: "SVC4123" - } -#-----------SVC4124--------------------------- - MISSING_ARTIFACT_TYPE: { - code: 400, - message: "Error: Missing artifact type.", - messageId: "SVC4124" - } -#-----------SVC4125--------------------------- -# %1-artifact name - ARTIFACT_EXIST: { - code: 400, - message: "Error: Artifact '%1' already exists.", - messageId: "SVC4125" - } -#---------SVC4126------------------------------ -# %1 - resource/service/product/... -# %2 - field (tag, vendor name...) - INVALID_FIELD_FORMAT: { - code: 400, - message: "Error: Invalid %1 %2 format.", - messageId: "SVC4126" - } -#-----------SVC4127--------------------------- - ARTIFACT_INVALID_MD5: { - code: 400, - message: "Error: Invalid artifact checksum.", - messageId: "SVC4127" - } -#-----------SVC4128--------------------------- - MISSING_ARTIFACT_NAME: { - code: 400, - message: "Error: Invalid content. Missing artifact name.", - messageId: "SVC4128" - } -#-----------SVC4129--------------------------- - MISSING_PROJECT_CODE: { - code: 400, - message: "Error: Invalid Content. Missing PROJECT_CODE number.", - messageId: "SVC4129" - } -#-----------SVC4130--------------------------- - INVALID_PROJECT_CODE: { - code: 400, - message: "Error: Invalid Content. PROJECT_CODE must be from 3 up to 50 characters.", - messageId: "SVC4130" - } -#-----------SVC4131--------------------------- -# %1-resource/service -# %2-srtifact/artifacts -# %3-semicolomn separated list of artifact - COMPONENT_MISSING_MANDATORY_ARTIFACTS: { - code: 403, - message: "Error: Missing mandatory informational %1 %2: [%3].", - messageId: "SVC4131" - } -#-----------SVC4132--------------------------- -# %1 - lifecycle type name - LIFECYCLE_TYPE_ALREADY_EXIST: { - code: 409, - message: "Error: Lifecycle Type with name '%1' already exists.", - messageId: "SVC4132" - } -#-----------SVC4133--------------------------- -# %1 - service version -# %2 - service name - SERVICE_NOT_AVAILABLE_FOR_DISTRIBUTION: { - code: 403, - message: "Error: Version %1 of '%2' service is not available for distribution.", - messageId: "SVC4133" - } -#-----------SVC4134--------------------------- - MISSING_LIFECYCLE_TYPE: { - code: 400, - message: "Error: Invalid Content. Missing interface life-cycle type.", - messageId: "SVC4134" - } -#---------SVC4135------------------------------ - SERVICE_CATEGORY_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Service category cannot be changed once the service is certified.", - messageId: "SVC4135" - } -#---------SVC4136------------------------------ -# %1 - distribution environment name - DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE: { - code: 500, - message: "Error: Requested distribution environment '%1' is not available.", - messageId: "SVC4136" - } -#---------SVC4137------------------------------ -# %1 - distribution environment name - DISTRIBUTION_ENVIRONMENT_NOT_FOUND: { - code: 400, - message: "Error: Requested distribution environment '%1' was not found.", - messageId: "SVC4137" - } -#---------SVC4138------------------------------ - DISTRIBUTION_ENVIRONMENT_INVALID: { - code: 400, - message: "Error: Invalid distribution environment.", - messageId: "SVC4138" - } -#---------SVC4139------------------------------ -# %1 - service name - DISTRIBUTION_ARTIFACT_NOT_FOUND: { - code: 409, - message: "Error: Service '%1' cannot be distributed due to missing deployment artifacts.", - messageId: "SVC4139" - } -#---------SVC4200------------------------------ -# %1 - Service/Resource -# %2 - max icon name length - COMPONENT_ICON_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. %1 icon name exceeds limit of %2 characters.", - messageId: "SVC4200" - } -#---------SVC4300------------------------------ - RESTRICTED_ACCESS: { - code: 403, - message: "Error: Restricted access.", - messageId: "SVC4300" - } -#---------SVC4301------------------------------ - RESTRICTED_OPERATION: { - code: 409, - message: "Error: Restricted operation.", - messageId: "SVC4301" - } -#---------SVC4500------------------------------ - MISSING_BODY: { - code: 400 , - message: "Error: Missing request body.", - messageId: "SVC4500" - } -#---------SVC4501------------------------------ - MISSING_PUBLIC_KEY: { - code: 400 , - message: "Error: Invalid Content. Missing mandatory parameter 'apiPublicKey'." , - messageId: "SVC4501" - } -#---------SVC4502------------------------------ - DISTRIBUTION_ENV_DOES_NOT_EXIST: { - code: 400 , - message: "Error: Invalid Body : Missing mandatory parameter 'distrEnvName'." , - messageId: "SVC4502" - } -#-----------SVC4503--------------------------- -# %1 - service name - SERVICE_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' service was not found.", - messageId: "SVC4503" - } - -#---------SVC4504------------------------------ -# %1 - Service/Resource -# %2 - service/resource version - COMPONENT_VERSION_NOT_FOUND: { - code: 404, - message: "Error: %1 version %2 was not found.", - messageId: "SVC4504" - } -#-----------SVC4505--------------------------- - #%1-artifact name - - ARTIFACT_NOT_FOUND: { - code: 404, - message: "Error: Artifact '%1' was not found.", - messageId: "SVC4505" - } -#---------SVC4506------------------------------ - MISSING_ENV_NAME: { - code: 400 , - message: "Error: Invalid Content. Missing mandatory parameter 'distrEnvName'.", - messageId: "SVC4506" - } -#---------SVC4507------------------------------ - COMPONENT_INVALID_TAGS_NO_COMP_NAME: { - code: 400, - message: "Error: Invalid Content. One of the tags should be the component name.", - messageId: "SVC4507" - } - -#---------SVC4508------------------------------ - SERVICE_NAME_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Service name cannot be changed once the service is certified.", - messageId: "SVC4508" - } - -#---------SVC4509------------------------------ - SERVICE_ICON_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Icon cannot be changed once the service is certified.", - messageId: "SVC4509" - } -#---------SVC4510------------------------------ -# %1 - icon name max length - SERVICE_ICON_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Icon name exceeds limit of %1 characters.", - messageId: "SVC4510" - } -#---------SVC4511------------------------------ - DISTRIBUTION_REQUESTED_NOT_FOUND: { - code: 404, - message: "Error: Requested distribution was not found.", - messageId: "SVC4511" - } -#---------SVC4512------------------------------ -# %1 - Distribution ID - DISTRIBUTION_REQUESTED_FAILED: { - code: 403, - message: "Error: Requested distribution '%1' failed.", - messageId: "SVC4512" - } -#---------SVC4513------------------------------ - RESOURCE_CATEGORY_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Resource category cannot be changed once the resource is certified.", - messageId: "SVC4513" - } -#---------SVC4514------------------------------ - RESOURCE_NAME_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Resource name cannot be changed once the resource is certified.", - messageId: "SVC4514" - } -#---------SVC4515------------------------------ - RESOURCE_ICON_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Icon cannot be changed once the resource is certified.", - messageId: "SVC4515" - } -#---------SVC4516------------------------------ - RESOURCE_VENDOR_NAME_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Vendor name cannot be changed once the resource is certified.", - messageId: "SVC4516" - } -#---------SVC4517------------------------------ - RESOURCE_DERIVED_FROM_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Derived from resource template cannot be changed once the resource is certified.", - messageId: "SVC4517" - } -#---------SVC4518------------------------------ -# %1 - max length - COMPONENT_SINGLE_TAG_EXCEED_LIMIT: { - code: 400, - message: "Error: Invalid Content. Single tag exceeds limit of %1 characters.", - messageId: "SVC4518" - } -#---------SVC4519------------------------------ - INVALID_DEFAULT_VALUE: { - code: 400, - message: "Error: mismatch in data-type occurred for property %1. data type is %2 and default value found is %3.", - messageId: "SVC4519" - } -#---------SVC4520------------------------------ -# %1 - service or resource - ADDITIONAL_INFORMATION_MAX_NUMBER_REACHED: { - code: 409, - message: "Error: Maximal number of additional %1 parameters was reached.", - messageId: "SVC4520" - } -#---------SVC4521------------------------------ - ADDITIONAL_INFORMATION_EMPTY_STRING_NOT_ALLOWED: { - code: 400, - message: "Error: Invalid Content. The Additional information label and value cannot be empty.", - messageId: "SVC4521" - } -#---------SVC4522------------------------------ -# %1 - label/value -# %2 - Maximal length of %1 - ADDITIONAL_INFORMATION_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Additional information %1 exceeds limit of %2 characters.", - messageId: "SVC4522" - } -#---------SVC4523------------------------------ - ADDITIONAL_INFORMATION_KEY_NOT_ALLOWED_CHARACTERS: { - code: 400, - message: 'Error: Invalid Content. Additional information label is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.', - messageId: "SVC4523" - } -#---------SVC4524------------------------------ - ADDITIONAL_INFORMATION_NOT_FOUND: { - code: 409, - message: "Error: Requested additional information was not found.", - messageId: "SVC4524" - } -#---------SVC4525------------------------------ - ADDITIONAL_INFORMATION_VALUE_NOT_ALLOWED_CHARACTERS: { - code: 400, - message: 'Error: Invalid Content. Additional information contains non-english characters.', - messageId: "SVC4525" - } -#---------SVC4526------------------------------ - RESOURCE_INSTANCE_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' resource instance was not found.", - messageId: "SVC4526" - } -#---------SVC4527------------------------------ - ASDC_VERSION_NOT_FOUND: { - code: 500, - message: 'Error: ASDC version cannot be displayed.', - messageId: "SVC4527" - } -#---------SVC4528------------------------------ -# %1-artifact url/artifact label/artifact description/VNF Service Indicator - MISSING_DATA: { - code: 400, - message: "Error: Invalid content. Missing %1.", - messageId: "SVC4528" - } -#---------SVC4529------------------------------ -# %1-artifact url/artifact label/artifact description/artifact name -# %2 - Maximal length of %1 - EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. %1 exceeds limit of %2 characters.", - messageId: "SVC4529" - } -#---------SVC4530------------------------------ - ARTIFACT_INVALID_TIMEOUT: { - code: 400, - message: "Error: Invalid Content. Artifact Timeout should be set to valid positive non-zero number of minutes.", - messageId: "SVC4530" - } -#---------SVC4531------------------------------ - SERVICE_IS_VNF_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: VNF Indicator cannot be updated for certified service.", - messageId: "SVC4531" - } - #---------SVC4532------------------------------ - RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE: { - code: 404, - message: "Error: Requested '%1' resource instance was not found on the service '%2.", - messageId: "SVC4532" - } - #---------SVC4533------------------------------ - # %1 - "HEAT"/"HEAT_ENV"/"MURANO_PKG"/"YANG_XML" - WRONG_ARTIFACT_FILE_EXTENSION: { - code: 400, - message: "Error: Invalid file extension for %1 artifact type.", - messageId: "SVC4533" - } - -#---------SVC4534------------------------------ -# %1 - "HEAT"/"HEAT_ENV" - INVALID_YAML: { - code: 400, - message: "Error: Uploaded YAML file for %1 artifact is invalid.", - messageId: "SVC4534" - } - -#---------SVC4535------------------------------ -# %1 - "HEAT" - INVALID_DEPLOYMENT_ARTIFACT_HEAT: { - code: 400, - message: "Error: Invalid %1 artifact.", - messageId: "SVC4535" - } -#---------SVC4536------------------------------ -# %1 - "Resource"/"Service" -# %2 - resource/service name -# %3 - "HEAT"/"HEAT_ENV"/"MURANO_PKG" -# %4 - "HEAT"/"HEAT_ENV"/"MURANO_PKG - DEPLOYMENT_ARTIFACT_OF_TYPE_ALREADY_EXISTS: { - code: 400, - message: "Error: %1 '%2' already has a deployment artifact of %3 type .Please delete or update an existing %4 artifact.", - messageId: "SVC4536" - } - -#---------SVC4537------------------------------ - MISSING_HEAT: { - code: 400, - message: "Error: Missing HEAT artifact. HEAT_ENV artifact cannot be uploaded without corresponding HEAT template.", - messageId: "SVC4537" - } -#---------SVC4538------------------------------ - MISMATCH_HEAT_VS_HEAT_ENV: { - code: 400, - message: "Error: Invalid artifact content. Parameter's set in HEAT_ENV '%1' artifact doesn't match the parameters in HEAT '%2' artifact.", - messageId: "SVC4538" - } -#---------SVC4539------------------------------ - INVALID_RESOURCE_PAYLOAD: { - code: 400, - message: "Error: Invalid resource payload.", - messageId: "SVC4539" - } -#---------SVC4540------------------------------ - INVALID_TOSCA_FILE_EXTENSION: { - code: 400, - message: "Error: Invalid file extension for TOSCA template.", - messageId: "SVC4540" - } -#---------SVC4541------------------------------ - INVALID_YAML_FILE: { - code: 400, - message: "Error: Invalid YAML file.", - messageId: "SVC4541" - } -#---------SVC4542------------------------------ - INVALID_TOSCA_TEMPLATE: { - code: 400, - message: "Error: Invalid TOSCA template.", - messageId: "SVC4542" - } -#---------SVC4543------------------------------ - NOT_RESOURCE_TOSCA_TEMPLATE: { - code: 400, - message: "Error: Imported Service TOSCA template.", - messageId: "SVC4543" - } -#---------SVC4544------------------------------ - NOT_SINGLE_RESOURCE: { - code: 400, - message: "Error: Imported TOSCA template should contain one resource definition.", - messageId: "SVC4544" - } -#---------SVC4545------------------------------ - INVALID_RESOURCE_NAMESPACE: { - code: 400, - message: "Error: Invalid resource namespace.", - messageId: "SVC4545" - } -#---------SVC4546------------------------------ - RESOURCE_ALREADY_EXISTS: { - code: 400, - message: "Error: Imported resource already exists in ASDC Catalog.", - messageId: "SVC4546" - } -#---------SVC4549------------------------------ - INVALID_RESOURCE_CHECKSUM: { - code: 400, - message: "Error: Invalid resource checksum.", - messageId: "SVC4549" - } -#---------SVC4550------------------------------ - #%1  -  Consumer salt - INVALID_LENGTH: { - code: 400, - message: "Error: Invalid %1 length.", - messageId: "SVC4550" - } - #---------SVC4551------------------------------ - #%1  -  ECOMP User name - ECOMP_USER_NOT_FOUND: { - code: 404, - message: "Error: ECOMP User '%1' was not found.", - messageId: "SVC4551" - } -#---------SVC4552------------------------------ - CONSUMER_ALREADY_EXISTS: { - code: 409, - message: "Error: ECOMP User already exists.", - messageId: "SVC4552" - } -#---------SVC4553----------------------------- - #%1  -  Consumer name / Consumer password/ Consumer salt - INVALID_CONTENT_PARAM: { - code: 400, - message: "Error: %1 is invalid.", - messageId: "SVC4553" - } - #---------SVC4554------------------------------ -# %1 - "Resource"/"Service" - COMPONENT_ARTIFACT_NOT_FOUND: { - code: 404, - message: "Error: Requested artifact doesn't belong to specified %1.", - messageId: "SVC4554" - } -#---------SVC4554------------------------------ -# %1 - "Service name" - SERVICE_DEPLOYMENT_ARTIFACT_NOT_FOUND: { - code: 403, - message: "Error: Requested '%1' service is not ready for certification. Service has to have at least one deployment artifact.", - messageId: "SVC4554" - } -#---------SVC4555------------------------------ -#%1 - "Resource"/"Service"/"Product" -#%2 - "category" - COMPONENT_ELEMENT_INVALID_NAME_LENGTH: { - code: 400, - message: "Error: Invalid %1 %2 name length.", - messageId: "SVC4555" - } -#---------SVC4556------------------------------ -#%1 - "Resource"/"Service"/"Product" -#%2 - "category" - COMPONENT_ELEMENT_INVALID_NAME_FORMAT: { - code: 400, - message: "Error: Invalid %1 %2 name format.", - messageId: "SVC4556" - } -#---------SVC4557------------------------------ -#%1 - "Resource"/"Service"/"Product" -#%2 - "category name" - COMPONENT_CATEGORY_ALREADY_EXISTS: { - code: 409, - message: "Error: %1 category name '%2' already exists.", - messageId: "SVC4557" - } -#---------SVC4558------------------------------ -# %1 - "service"/"VF" -# %2 - "Resource name" - VALIDATED_RESOURCE_NOT_FOUND: { - code: 403, - message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource.", - messageId: "SVC4558" - } -#---------SVC4559------------------------------ -# %1 - "service"/"VF" -# %2 - "Resource name" - FOUND_ALREADY_VALIDATED_RESOURCE: { - code: 403, - message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource. Please use already available validated resource version.", - messageId: "SVC4559" - } -#---------SVC4560------------------------------ -# %1 - "service"/"VF" -# %2 - "Resource name" - FOUND_LIST_VALIDATED_RESOURCES: { - code: 403, - message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource. Please use one of available validated resource versions.", - messageId: "SVC4560" - } -#---------SVC4561------------------------------ -# %1 - "resource"/"product" -# %2 - "category" -# %3 - "category name" - COMPONENT_CATEGORY_NOT_FOUND: { - code: 404, - message: "Error: Requested %1 %2 '%3' was not found.", - messageId: "SVC4561" - } -#---------SVC4562------------------------------ -# %1 - "Resource"/"Product" -# %2 - "sub-category name" -# %3 - "category name" - COMPONENT_SUB_CATEGORY_EXISTS_FOR_CATEGORY: { - code: 409, - message: "Error: %1 sub-category '%2' already exists under '%3' category.", - messageId: "SVC4562" - } -#---------SVC4563------------------------------ -# %1 - "Product" -# %2 - "grouping name" -# %3 - "sub-category name" - COMPONENT_GROUPING_EXISTS_FOR_SUB_CATEGORY: { - code: 409, - message: "Error: %1 grouping '%2' already exists under '%3' sub-category.", - messageId: "SVC4563" - } -#---------SVC4564------------------------------ -# %1 - product name - PRODUCT_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' product was not found.", - messageId: "SVC4564" - } -#---------SVC4565------------------------------ -# %1 - "HEAT" -# %2 - parameter type ("string" , "boolean" , "number") -# %3 - parameter name - INVALID_HEAT_PARAMETER_VALUE: { - code: 400, - message: "Error: Invalid %1 artifact. Invalid %2 value set for '%3' parameter.", - messageId: "SVC4565" - } -#---------SVC4566------------------------------ -# %1 - "HEAT" -# %2 - parameter type ("string" , "boolean" , "number") - INVALID_HEAT_PARAMETER_TYPE: { - code: 400, - message: "Error: Invalid %1 artifact. Unsupported '%2' parameter type.", - messageId: "SVC4566" - } -#---------SVC4567------------------------------ -# %1 - "YANG_XML" - INVALID_XML: { - code: 400, - message: "Error: Uploaded XML file for %1 artifact is invalid.", - messageId: "SVC4567" - } -#---------SVC4567------------------------------ -# %1 - "User Name and UserId" -# %2 -"checked-out"/"in-certification" - CANNOT_DELETE_USER_WITH_ACTIVE_ELEMENTS: { - code: 409, - message: "Error: User cannot be deleted. User '%1' has %2 projects.", - messageId: "SVC4567" - } -#---------SVC4568------------------------------ -# %1 - "User Name and UserId" -# %2 -"checked-out"/"in-certification" - CANNOT_UPDATE_USER_WITH_ACTIVE_ELEMENTS: { - code: 409, - message: "Error: Role cannot be changed. User '%1' has %2 projects.", - messageId: "SVC4568" - } -#---------SVC4570------------------------------ - UPDATE_USER_ADMIN_CONFLICT: { - code: 409, - message: "Error: An administrator is not allowed to change his/her role.", - messageId: "SVC4570" - } -#---------SVC4571------------------------------ - SERVICE_CANNOT_CONTAIN_SUBCATEGORY: { - code: 400, - message: "Error: Sub category cannot be defined for service", - messageId: "SVC4571" - } -#---------SVC4572------------------------------ -# %1 - "Resource"/"Service" - COMPONENT_TOO_MUCH_CATEGORIES: { - code: 400, - message: "Error: %1 must have only 1 category", - messageId: "SVC4572" - } -#---------SVC4574------------------------------ - RESOURCE_TOO_MUCH_SUBCATEGORIES: { - code: 400, - message: "Error: Resource must have only 1 sub category", - messageId: "SVC4574" - } -#---------SVC4575------------------------------ - COMPONENT_MISSING_SUBCATEGORY: { - code: 400, - message: "Error: Missing sub category", - messageId: "SVC4575" - } - #---------SVC4576------------------------------ -# %1 - "component type" - UNSUPPORTED_ERROR: { - code: 400, - message: "Error : Requested component type %1 is unsupported.", - messageId: "SVC4576" - } - #---------SVC4577------------------------------ -# %1 - "resource type" - RESOURCE_CANNOT_CONTAIN_RESOURCE_INSTANCES: { - code: 409, - message: "Error : Resource of type %1 cannot contain resource instances.", - messageId: "SVC4577" - } -#---------SVC4578------------------------------ -# %1 - "Resource"/"Service" -# %2 - resource/service name -# %3 - "artifact name" - DEPLOYMENT_ARTIFACT_NAME_ALREADY_EXISTS: { - code: 400, - message: "Error: %1 '%2' already has a deployment artifact named '%3'.", - messageId: "SVC4578" - } -#---------SVC4579------------------------------ -# %1 - "Category"/"Sub-Category"/"Group" -# %2 - category/sub-category/grouping name. - INVALID_GROUP_ASSOCIATION: { - code: 400, - message: "Error: Invalid group association. %1 '%2' was not found.", - messageId: "SVC4579" - } -#---------SVC4580------------------------------ - EMPTY_PRODUCT_CONTACTS_LIST: { - code: 400, - message: "Error: Invalid content. At least one Product Contact has to be specified.", - messageId: "SVC4580" - } -#---------SVC4581------------------------------ -# %1 - UserId - INVALID_PRODUCT_CONTACT: { - code: 400, - message: "Error: Invalid content. User '%1' cannot be set as Product Contact.", - messageId: "SVC4581" - } -#---------SVC4582------------------------------ -# %1 - Product -# %2 - "abbreviated"/"full" - MISSING_ONE_OF_COMPONENT_NAMES: { - code: 400, - message: "Error: Invalid content. Missing %1 %2 name.", - messageId: "SVC4582" - } -#---------SVC4583------------------------------ -# %1 - "Icon" -# %2 - "resource"/"service"/"product" - COMPONENT_PARAMETER_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: %1 cannot be changed once the %2 is certified.", - messageId: "SVC4583" - } -#---------SVC4584------------------------------ -# %1 - service/VF name -# %2 - "service" /"VF" -# %3 - resource instance origin type -# %4 - resource instance name -# %5 - requirement/capability -# %6 - requirement/capability name -# %7 - "fulfilled" (for req)/"consumed (for cap)" - REQ_CAP_NOT_SATISFIED_BEFORE_CERTIFICATION: { - code: 403, - message: "Error: Requested '%1' %2 is not ready for certification. %3 '%4' has to have %5 '%6' %7.", - messageId: "SVC4584" - } -#---------SVC4585------------------------------ - INVALID_OCCURRENCES: { - code: 400, - message: "Error: Invalid occurrences format.", - messageId: "SVC4585" - } -#---------SVC4586------------------------------ -#---------SVC4586------------------------------ - INVALID_SERVICE_API_URL: { - code: 400, - message: 'Error: Invalid Service API URL. Please check whether your URL has a valid domain extension and does not contain the following characters - #?&@%+;,=$<>~^`\[]{}|"*!', - messageId: "SVC4586" - } -#---------SVC4587------------------------------ -# %1 - Data type name - DATA_TYPE_ALREADY_EXIST: { - code: 409, - message: 'Error: Data type %1 already exists.', - messageId: "SVC4587" - } -#---------SVC4588------------------------------ -# %1 - Data type name - DATA_TYPE_NOR_PROPERTIES_NEITHER_DERIVED_FROM: { - code: 400, - message: 'Error: Invalid Data type %1. Data type must have either a valid derived from declaration or at least one valid property', - messageId: "SVC4588" - } -#---------SVC4589------------------------------ -# %1 - Data type name - DATA_TYPE_PROPERTIES_CANNOT_BE_EMPTY: { - code: 400, - message: "Error: Invalid Data type %1. 'properties' parameter cannot be empty if provided.", - messageId: "SVC4589" - } -#---------SVC4590------------------------------ -# %1 - Property type name -# %2 - Property name - INVALID_PROPERTY_TYPE: { - code: 400, - message: "Error: Invalid Property type %1 in property %2.", - messageId: "SVC4590" - } -#---------SVC4591------------------------------ -# %1 - Property inner type -# %2 - Property name - INVALID_PROPERTY_INNER_TYPE: { - code: 400, - message: "Error: Invalid property inner type %1, in property %2", - messageId: "SVC4591" - } -#---------SVC4592------------------------------ -# %1 - component instance name -# %2 - "resource instance"/"service instance" - COMPONENT_INSTANCE_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' %2 was not found.", - messageId: "SVC4592" - } -#---------SVC4593------------------------------ -# %1 - component instance name -# %2 - "resource instance"/"service instance" -# %3 - "resource/"service"/"product" -# %4 - container name - COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER: { - code: 404, - message: "Error: Requested '%1' %2 was not found on the %3 '%4'.", - messageId: "SVC4593" - } -#---------SVC4594------------------------------ -#%1 - requirement / capability -#%2 - requirement name - IMPORT_DUPLICATE_REQ_CAP_NAME: { - code: 400, - message: "Error: Imported TOSCA template contains more than one %1 named '%2'.", - messageId: "SVC4594" - } -#---------SVC4595------------------------------ -#%1 - requirement / capability -#%2 - requirement name -#%3 - parent containing the requirement - IMPORT_REQ_CAP_NAME_EXISTS_IN_DERIVED: { - code: 400, - message: "Error: Imported TOSCA template contains %1 '%2' that is already defined by derived template %3.", - messageId: "SVC4595" - } -#---------SVC4596------------------------------ -# %1 - Data type name - DATA_TYPE_DERIVED_IS_MISSING: { - code: 400, - message: "Error: Invalid Content. The ancestor data type %1 cannot be found in the system.", - messageId: "SVC4596" - } -#---------SVC4597------------------------------ -# %1 - Data type name -# %2 - Property names - DATA_TYPE_PROPERTY_ALREADY_DEFINED_IN_ANCESTOR: { - code: 400, - message: "Error: Invalid Content. The data type %1 contains properties named %2 which are already defined in one of its ancestors.", - messageId: "SVC4597" - } -#---------SVC4598------------------------------ -# %1 - Data type name - DATA_TYPE_DUPLICATE_PROPERTY: { - code: 400, - message: "Error: Invalid Content. The data type %1 contains duplicate property.", - messageId: "SVC4598" - } -#---------SVC4599------------------------------ -# %1 - Data type name -# %2 - Property names - DATA_TYPE_PROEPRTY_CANNOT_HAVE_SAME_TYPE_OF_DATA_TYPE: { - code: 400, - message: "Error: Invalid Content. The data type %1 contains properties %2 which their type is this data type.", - messageId: "SVC4599" - } -#---------SVC4600------------------------------ -# %1 - Data type name - DATA_TYPE_CANNOT_HAVE_PROPERTIES: { - code: 400, - message: "Error: Invalid Content. The data type %1 cannot have properties since it is of type scalar", - messageId: "SVC4600" - } -#---------SVC4601------------------------------ - NOT_TOPOLOGY_TOSCA_TEMPLATE: { - code: 400, - message: "Error: TOSCA yaml file %1 cannot be modeled to VF as it does not contain 'topology_template.", - messageId: "SVC4601" - } -#---------SVC4602-------------------------------- -# %1 - yaml file name -# %2 - node_template label -# %3 - node_template type - INVALID_NODE_TEMPLATE: { - code: 400, - message: "Error: TOSCA yaml file '%1' contains node_template '%2' of type '%3' that does not represent existing VFC/CP/VL", - messageId: "SVC4602" - } -#---------SVC4603------------------------------ -# %1 - component type -# %2 - component name -# %3 - state - ILLEGAL_COMPONENT_STATE: { - code: 403, - message: "Error: Component instance of %1 can not be created because the component '%2' is in an illegal state %3.", - messageId: "SVC4603" - } -#---------SVC4604------------------------------ -# %1 - csar file name - CSAR_INVALID: { - code: 400, - message: "Error: TOSCA CSAR '%1' is invalid. 'TOSCA-Metadata/Tosca.meta' file must be provided.", - messageId: "SVC4604" - } -#---------SVC4605------------------------------ -# %1 - csar file name - CSAR_INVALID_FORMAT: { - code: 400, - message: "Error: TOSCA CSAR '%1' is invalid. Invalid 'TOSCA-Metadata/Tosca.meta' file format.", - messageId: "SVC4605" - } -#---------SVC4606------------------------------ -# %1 - property name -# %2 - property type -# %3 - property innerType -# %4 - default value is - INVALID_COMPLEX_DEFAULT_VALUE: { - code: 400, - message: "Error: Invalid default value of property %1. Data type is %2 with inner type %3 and default value found is %4.", - messageId: "SVC4606" - } -#---------SVC4607------------------------------ -# %1 - csar file name - CSAR_NOT_FOUND: { - code: 400, - message: "Error: TOSCA CSAR '%1' is not found.", - messageId: "SVC4607" - } -#---------SVC4608------------------------------ -# %1 - artifact name -# %2 - component type -# %3 - actual component type - MISMATCH_BETWEEN_ARTIFACT_TYPE_AND_COMPONENT_TYPE: { - code: 400, - message: "Error: Artifact %1 is only compatible with component of type %2, but component type is %3.", - messageId: "SVC4608" - } - -#---------SVC4609------------------------------ -# %1 - "INVALID_JSON" - INVALID_JSON: { - code: 400, - message: "Error: Uploaded JSON file for %1 artifact is invalid.", - messageId: "SVC4609" - } -#---------SVC4610------------------------------ -# %1 - csar file name -# %2 - missing file name - YAML_NOT_FOUND_IN_CSAR: { - code: 400, - message: "Error - TOSCA CSAR %1 is invalid. TOSCA-Metadata/Tosca.meta refers to file %2 that is not provided.", - messageId: "SVC4610" - } -#---------SVC4611------------------------------ -# %1 - group name - GROUP_MEMBER_EMPTY: { - code: 400, - message: "Error: Invalid Content. Group %1 member list was provided but does not have values", - messageId: "SVC4611" - } -#---------SVC4612------------------------------ -# %1 - group name - GROUP_TYPE_ALREADY_EXIST: { - code: 409, - message: 'Error: Group type %1 already exists.', - messageId: "SVC4612" - } -#---------SVC4613------------------------------ -# %1 - group name -# %2 - VF name(component name) -# %3 - actual component type [VF] - GROUP_ALREADY_EXIST: { - code: 409, - message: "Error: Group with name '%1' already exists in %2 %3.", - messageId: "SVC4613" - } -#---------SVC4614------------------------------ -# %1 - group type - GROUP_TYPE_IS_INVALID: { - code: 400, - message: "Error: Invalid content. Group type %1 does not exist", - messageId: "SVC4614" - } -#---------SVC4615------------------------------ -# %1 - group name - GROUP_MISSING_GROUP_TYPE: { - code: 400, - message: "Error: Invalid Content. Missing Group Type for group '%1'", - messageId: "SVC4615" - } -#---------SVC4616------------------------------ -# %1 - member name -# %2 - group name -# %3 - VF name -# %4 - component type [VF ] - GROUP_INVALID_COMPONENT_INSTANCE: { - code: 400, - message: "Error: Member '%1' listed in group '%2' is not part of '%3' %4.", - messageId: "SVC4616" - } -#---------SVC4617------------------------------ -# %1 - member name -# %2 - group name -# %3 - group type - GROUP_INVALID_TOSCA_NAME_OF_COMPONENT_INSTANCE: { - code: 400, - message: "Error: member %1 listed in group %2 is not part of allowed members of group type %3.", - messageId: "SVC4617" - } -#---------SVC4618------------------------------ -# %1 - missing file name -# %2 - csar file name - ARTIFACT_NOT_FOUND_IN_CSAR: { - code: 400, - message: "Error: artifact %1 is defined in CSAR %2 manifest but is not provided", - messageId: "SVC4618" - } -#---------SVC4619------------------------------ -# %1 - artifact name -# %2 - artifact type -# %3 - existing artifact type - ARTIFACT_ALREADY_EXIST_IN_DIFFERENT_TYPE_IN_CSAR: { - code: 400, - message: "Error: artifact %1 in type %2 already exists in type %3.", - messageId: "SVC4619" - } -#---------SVC4620------------------------------ - FAILED_RETRIVE_ARTIFACTS_TYPES: { - code: 400, - message: "Error: Failed to retrieve list of suported artifact types.", - messageId: "SVC4620" - } -#---------SVC4621------------------------------ -# %1 - artifact name -# %2 - master - ARTIFACT_ALRADY_EXIST_IN_MASTER_IN_CSAR: { - code: 400, - message: "Error: artifact %1 already exists in master %2 .", - messageId: "SVC4621" - } -#---------SVC4622------------------------------ -# %1 - artifact name -# %2 - artifact type -# %3 - master name -# %4 - master type - ARTIFACT_NOT_VALID_IN_MASTER: { - code: 400, - message: "Error: artifact %1 in type %2 can not be exists under master %3 in type %4.", - messageId: "SVC4622" - } -#---------SVC4623------------------------------ -# %1 - artifact name -# %2 - artifact type -# %3 - env name -# %4 - existing env - ARTIFACT_NOT_VALID_ENV: { - code: 400, - message: "Error: Artifact %1 in type %2 with env %3 already exists with another env %4", - messageId: "SVC4623" - } -#---------SVC4624------------------------------ -# %1 - groups names -# %2 - VF name -# %3 - component type [VF ] - GROUP_IS_MISSING: { - code: 404, - message: "Error: Invalid Content. The groups '%1' cannot be found under %2 %3.", - messageId: "SVC4624" - } -#---------SVC4625------------------------------ -# %1 - groups name - GROUP_ARTIFACT_ALREADY_ASSOCIATED: { - code: 400, - message: "Error: Invalid Content. Artifact already associated to group '%1'.", - messageId: "SVC4625" - } -#---------SVC4626------------------------------ -# %1 - groups name - GROUP_ARTIFACT_ALREADY_DISSOCIATED: { - code: 400, - message: "Error: Invalid Content. Artifact already dissociated from group '%1'.", - messageId: "SVC4626" - } -#---------SVC4627------------------------------ -# %1 - property name -# %2 - group name -# %3 - group type name - GROUP_PROPERTY_NOT_FOUND: { - code: 400, - message: "Error: property %1 listed in group %2 is not exist in group type %3.", - messageId: "SVC4627" - } -#---------SVC4628------------------------------ -# %1 - csarUUID -# %2 - VF name - VSP_ALREADY_EXISTS: { - code: 400, - message: "Error: The VSP with UUID %1 was already imported for VF %2. Please select another or update the existing VF.", - messageId: "SVC4628" - } -#---------SVC4629------------------------------ -# %1 - VF name - MISSING_CSAR_UUID: { - code: 400, - message: "Error: The Csar UUID or payload name is missing for VF %1.", - messageId: "SVC4629" - } -#---------SVC4630------------------------------ -# %1 - VF name -# %2 - new csarUUID -# %3 - old csarUUID - RESOURCE_LINKED_TO_DIFFERENT_VSP: { - code: 400, - message: "Error: Resource %1 cannot be updated using CsarUUID %2 since the resource is linked to a different VSP with csarUUID %3.", - messageId: "SVC4630" - } -#---------SVC4631------------------------------ -# %1 - policy name - POLICY_TYPE_ALREADY_EXIST: { - code: 409, - message: "Error: Policy type %1 already exists.", - messageId: "SVC4631" - } -#---------SVC4632------------------------------ -# %1 - target name -# %2 - policy type name - TARGETS_NON_VALID: { - code: 400, - message: "Error: target %1 listed in policy type %2 is not a group or resource.", - messageId: "SVC4632" - } -#---------SVC4633------------------------------ -# %1 - policy name - TARGETS_EMPTY: { - code: 400, - message: "Error: Invalid Content. Policy %1 target list was provided but does not have values", - messageId: "SVC4633" - } -#---------SVC4634------------------------------ - DATA_TYPE_CANNOT_BE_EMPTY: { - code: 500, - message: "Error: Data types are empty. Please import the data types.", - messageId: "SVC4634" - } -#---------SVC4635------------------------------ -# %1 - csar uuid - RESOURCE_FROM_CSAR_NOT_FOUND: { - code: 400, - message: "Error: resource from csar uuid %1 not found", - messageId: "SVC4635" - } -#---------SVC4636------------------------------ -# %1 - Data type name - DATA_TYPE_CANNOT_BE_UPDATED_BAD_REQUEST: { - code: 400, - message: 'Error: Data type %1 cannot be upgraded. The new data type does not contain old properties or the type of one of the properties has been changed.', - messageId: "SVC4636" - } -#-----------SVC4637--------------------------- -#%1 - attribute name - ATTRIBUTE_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' attribute was not found.", - messageId: "SVC4637" - } -#-----------SVC4638--------------------------- -#%1 - attribute name - ATTRIBUTE_ALREADY_EXIST: { - code: 409, - message: "Error: Attribute with '%1' name already exists.", - messageId: "SVC4638" - } -#-----------SVC4639--------------------------- -#%1 - property name - PROPERTY_NAME_ALREADY_EXISTS: { - code: 409, - message: "Error: Property with '%1' name and different type already exists.", - messageId: "SVC4639" - } -#-----------SVC4640--------------------------- -#%1 - property name - INVALID_PROPERTY: { - code: 409, - message: "Error: Invalid property received.", - messageId: "SVC4640" - } -#---------SVC4641----------------------------- -#%1 - invalid filter -#%2 - valid filters - INVALID_FILTER_KEY: { - code: 400, - message: "Error: The filter %1 is not applicable. Please use one of the following filters: %2", - messageId: "SVC4641" - } -#---------SVC4642----------------------------- -#%1 - asset type -#%2 - filter - NO_ASSETS_FOUND: { - code: 404, - message: "No %1 were found to match criteria %2", - messageId: "SVC4642" - } -#---------SVC4643------------------------------ -# %1 - "Resource"/"Product" -# %2 - "sub-category name" -# %3 - "category name" - COMPONENT_SUB_CATEGORY_NOT_FOUND_FOR_CATEGORY: { - code: 404, - message: "Error: %1 sub-category '%2' not found under category '%3'.", - messageId: "SVC4643" - } -#---------SVC4644------------------------------ -# %1 - Format - CORRUPTED_FORMAT: { - code: 400, - message: "Error: %1 format is corrupted.", - messageId: "SVC4644" - } -#---------SVC4645------------------------------ -# %1 - "groupType" - INVALID_VF_MODULE_TYPE: { - code: 400, - message: "Error: Invalid group type '%1' (should be VfModule).", - messageId: "SVC4645" - } -#---------SVC4646------------------------------ -# %1 - "groupName" - INVALID_VF_MODULE_NAME: { - code: 400, - message: "Error: Invalid Content. VF Module name '%1' contains invalid characters", - messageId: "SVC4646" - } - -#---------SVC4647------------------------------ -# %1 - "modifiedName" - INVALID_VF_MODULE_NAME_MODIFICATION: { - code: 400, - message: "Error: Invalid VF Module name modification, can not modify '%1'", - messageId: "SVC4647" - } -#---------SVC4648------------------------------ -# %1 - "inputId" -# %2 - "componentId" - INPUT_IS_NOT_CHILD_OF_COMPONENT: { - code: 400, - message: "Error: Input id: '%1' is not child of component id: '%2'", - messageId: "SVC4648" - } -#---------SVC4649------------------------------ -# %1 - "groupName" - GROUP_HAS_CYCLIC_DEPENDENCY: { - code: 400, - message: "Error: The group '%1' has cyclic dependency", - messageId: "SVC4649" - } -#---------SVC4650------------------------------ -# %1 - "Component Type" -# %2 - -# %3 - error description - AAI_ARTIFACT_GENERATION_FAILED: { - code: 500, - message: "Error: %1 %2 automatic generation of artifacts failed. Description: %3", - messageId: "SVC4650" - } -#---------SVC4651------------------------------ - PARENT_RESOURCE_DOES_NOT_EXTEND: { - code: 400, - message: "Error: Once resource is certified, derived_from can be changed only to a sibling", - messageId: "SVC4651" - } -#---------SVC4652------------------------------ -# %1 - resource/service - COMPONENT_INVALID_SUBCATEGORY: { - code: 400, - message: "Error: Invalid Content. Invalid %1 sub category.", - messageId: "SVC4652" - } -#---------SVC4653------------------------------ -# %1 - group instance uniqueId -# %2 - service uniqueId - GROUP_INSTANCE_NOT_FOUND_ON_COMPONENT_INSTANCE: { - code: 404, - message: "Error: Requested group instance %1 was not found on component %2.", - messageId: "SVC4653" - } -#---------SVC4654------------------------------ -# %1 - group property name -# %2 - valid min limit value -# %3 - valid max limit value - INVALID_GROUP_MIN_MAX_INSTANCES_PROPERTY_VALUE: { - code: 400, - message: "Error: Value of %1 must be not higher than %2, and not lower than %3.", - messageId: "SVC4654" - } -#---------SVC4655------------------------------ -# %1 - group property name -# %2 - valid min limit value -# %3 - valid max limit value - INVALID_GROUP_INITIAL_COUNT_PROPERTY_VALUE: { - code: 400, - message: "Error: Value of %1 must be between %2 and %3.", - messageId: "SVC4655" - } -#---------SVC4656------------------------------ -# %1 - group property name -# %2 - lower/higher -# %3 - valid max/min value - INVALID_GROUP_PROPERTY_VALUE_LOWER_HIGHER: { - code: 400, - message: "Error: Value of %1 must be %2 or equals to %3.", - messageId: "SVC4656" - } -#---------SVC4657------------------------------ -# %1 - certificationRequest / startTesting - RESOURCE_VFCMT_LIFECYCLE_STATE_NOT_VALID: { - code: 400, - message: "Error - Lifecycle state %1 is not valid for resource of type VFCMT", - messageId: "SVC4657" - } -#---------SVC4658------------------------------ -# %1 – asset type [service / resource ] -# %2 – main asset uuid -# %3 – not found asset type [service / resource] -# %4 – not found asset name - ASSET_NOT_FOUND_DURING_CSAR_CREATION: { - code: 400, - message: "Error: CSAR packaging failed for %1 %2. %3 %4 was not found", - messageId: "SVC4658" - } -#---------SVC4659------------------------------ -# %1 – asset type [service / resource ] -# %2 – main asset uuid -# %3 – Artifact name -# %4 – Artifact uuid - ARTIFACT_PAYLOAD_NOT_FOUND_DURING_CSAR_CREATION: { - code: 400, - message: " Error: CSAR packaging failed for %1 %2. Artifact %3 [%4] was not found", - messageId: "SVC4659" - } -#---------SVC4660------------------------------ -# %1 - assetType -# %2 - matching generic node type name - GENERIC_TYPE_NOT_FOUND: { - code: 404, - message: "Creation of %1 failed. Generic type %2 was not found", - messageId: "SVC4660" - } - #---------SVC4669----------------------------- - INVALID_RESOURCE_TYPE: { - code: 400, - message: "Error: Invalid resource type.", - messageId: "SVC4669" - } \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.yml b/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.yml deleted file mode 100644 index 120f33d5f1..0000000000 --- a/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.yml +++ /dev/null @@ -1,23 +0,0 @@ -services: - Mobility: - name: "Mobility1" - icons: ['mobility'] - Network_L1_3: - name: "Network L1-31" - icons: ['network_l_1-3'] -resources: - NetworkLayer23: - name: "Network Layer 2-31" - subcategories: - Router: - name: "Router" - icons: ['router'] - Gateway: - name: "Gateway" - icons: ['gateway'] - WAN_Connectors: - name: "WAN Connectors" - icons: ['connector'] - LAN_Connectors: - name: "LAN Connectors" - icons: ['connector'] diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.zip b/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.zip deleted file mode 100644 index 68b7aa9114..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.zip and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml deleted file mode 100644 index db40c2e5dd..0000000000 --- a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml +++ /dev/null @@ -1,13 +0,0 @@ -org.openecomp.groups.MyHeatStack1: - derived_from: tosca.groups.Root - description: Grouped all heat resources which are in the same heat stack - properties: - heat_files: - type: list - description: Heat files which associate to this group/heat stack - required: true - status: supported - entry_schema: - type: string - url_credential: - type: tosca.datatypes.Credential \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.zip b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.zip deleted file mode 100644 index 2619853f4b..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.zip and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml deleted file mode 100644 index 017aac2f57..0000000000 --- a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml +++ /dev/null @@ -1,14 +0,0 @@ -org.openecomp.groups.MyHeatStack2: - derived_from: tosca.groups.Root - description: Grouped all heat resources which are in the same heat stack - members: [ tosca.nodes.Compute ] - properties: - heat_files: - type: list - description: Heat files which associate to this group/heat stack - required: true - status: supported - entry_schema: - type: string - url_credential: - type: tosca.datatypes.Credential \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.zip b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.zip deleted file mode 100644 index 7f43af70eb..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.zip and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/other/mapping.json b/test-apis-ci/src/test/resources/CI/other/mapping.json deleted file mode 100644 index 3310d776b9..0000000000 --- a/test-apis-ci/src/test/resources/CI/other/mapping.json +++ /dev/null @@ -1,182 +0,0 @@ -{ "order": 1, "template": "auditingevents-*", "settings": {}, "mappings": -{ -"distributiondownloadevent": - { "properties": { - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "SERVICE_INSTANCE_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "RESOURCE_URL": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CONSUMER_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }}, - "_all": { "enabled": true } }, - "auditinggetuebclusterevent": - { "properties": { - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "SERVICE_INSTANCE_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CONSUMER_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }}, - "_all": { "enabled": true } }, - "distributionstatusevent": - { "properties": { - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "SERVICE_INSTANCE_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "RESOURCE_URL": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "TOPIC_NAME":{ "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CONSUMER_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }}, - "_all": { "enabled": true } }, -"distributionengineevent": - { "properties": { - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "SERVICE_INSTANCE_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "TOPIC_NAME":{ "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ROLE": { "include_in_all": true, "type": "string" }, - "API_KEY": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "D_ENV": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CONSUMER_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }}, - "_all": { "enabled": true } }, - "useraccessevent": { - "properties": { - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "SERVICE_INSTANCE_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "USER": { "include_in_all": true, "type": "string" }}, - "_all": { "enabled": true }}, -"resourceadminevent": - { "properties": { - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "SERVICE_INSTANCE_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CURR_VERSION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CURR_STATE": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "MODIFIER": { "include_in_all": true, "type": "string" }, - "PREV_VERSION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "PREV_STATE": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "RESOURCE_NAME": { "include_in_all": true, "type": "string" }, - "RESOURCE_TYPE": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DPREV_STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DCURR_STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "TOSCA_NODE_TYPE": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "COMMENT": { "include_in_all": true, "type": "string" }, - "ARTIFACT_DATA": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "PREV_ARTIFACT_UUID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CURR_ARTIFACT_UUID": { "include_in_all": true, "index": "not_analyzed", "type": "string" } }, - "_all": { "enabled": true }} , -"useradminevent": - { "properties": { - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "SERVICE_INSTANCE_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "USER_AFTER": { "include_in_all": true, "type": "string" }, - "USER_BEFORE": { "include_in_all": true, "type": "string" }, - "MODIFIER": { "include_in_all": true, "type": "string" }}, - "_all": { "enabled": true } }, -"distributionnotificationevent": - {"properties":{ - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "SERVICE_INSTANCE_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CURR_STATE": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CURR_VERSION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "MODIFIER": { "include_in_all": true, "type": "string" }, - "RESOURCE_NAME": { "include_in_all": true, "type": "string" }, - "RESOURCE_TYPE": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "TOPIC_NAME":{ "include_in_all": true, "index": "not_analyzed", "type": "string" }}, - "_all": { "enabled": true } }, - "categoryevent": - { "properties":{ - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "MODIFIER": { "include_in_all": true, "type": "string" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CATEGORY_NAME": { "include_in_all": true, "type": "string" }, - "SUB_CATEGORY_NAME": { "include_in_all": true, "type": "string" }, - "GROUPING_NAME": { "include_in_all": true, "type": "string" }, - "RESOURCE_TYPE": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "SERVICE_INSTANCE_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }}, - "_all": { "enabled": true } }, - "authevent": { - "properties": { - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }, - "DESC": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "URL": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "USER": { "include_in_all": true, "type": "string" }, - "AUTH_STATUS": { "include_in_all": true, "index": "not_analyzed","type": "string" } , - "REALM": { "include_in_all": true, "index": "not_analyzed","type": "string" }} , - "_all": { "enabled": true }}, - "consumerevent": - { "properties":{ - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "MODIFIER": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "ECOMP_USER": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }}, - "_all": { "enabled": true } }, - "getuserslistevent": - { "properties":{ - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "MODIFIER": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DETAILS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }}, - "_all": { "enabled": true } }, - "getcategoryhierarchyevent": - { "properties":{ - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "MODIFIER": { "include_in_all": true, "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DETAILS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }}, - "_all": { "enabled": true } }, - "distributiondeployevent": - { "properties": { - "ACTION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "CURR_VERSION": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "DESC": { "include_in_all": true, "type": "string" }, - "DID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "MODIFIER": { "include_in_all": true, "type": "string" }, - "REQUEST_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "RESOURCE_NAME": { "include_in_all": true, "type": "string" }, - "RESOURCE_TYPE": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "SERVICE_INSTANCE_ID": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "STATUS": { "include_in_all": true, "index": "not_analyzed", "type": "string" }, - "TIMESTAMP": { "include_in_all": true, "ignore_malformed": false, "format": "yyyy-MM-dd HH:mm:ss.SSS z", "precision_step": 4, "type": "date" }}, - "_all": { "enabled": true } }}, - "aliases": { "last_3_months": {}}} \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/addYangXmlArtifactToResource.xml b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/addYangXmlArtifactToResource.xml deleted file mode 100644 index 0415385bd0..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/addYangXmlArtifactToResource.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Lionel Andres Messi - 1987-06-24T00:00:00-00:00 - - - Cristiano Ronaldo - 1985-02-05T00:00:00-00:00 - - - FC Barcelona - - Lionel Andres Messi - Champions League 2014-2015 - 10 - 43 - - - - Real Madrid - - Cristiano Ronaldo - Champions League 2014-2015 - 7 - 48 - - - - - \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat 0 2.yaml b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat 0 2.yaml deleted file mode 100644 index 6835485ca1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat 0 2.yaml +++ /dev/null @@ -1,787 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: -# availability_zone_smp0: -# type: string -# default: nova -# availability_zone_smp1: -# type: string -# default: nova -# availability_zone_fe0: -# type: string -# default: nova -# availability_zone_fe1: -# type: string -# default: nova -# availability_zone_db0: -# type: string -# default: nova -# availability_zone_db1: -# type: string -# default: nova -# availability_zone_be0: -# type: string -# default: nova -# availability_zone_be1: -# type: string -# default: nova -# availability_zone_be2: -# type: string -# default: nova -# availability_zone_be3: -# type: string -# default: nova -# availability_zone_be4: -# type: string -# default: nova - - vnf_name: - type: string - description: Unique name for this VNF instance - default: This_is_the_SCP_name - vnf_id: - type: string - description: Unique ID for this VNF instance - default: This_is_ths_SCP_id - - flavor_scp_be_id: - type: string - description: flavor type - default: a1.Small - flavor_scp_fe_id: - type: string - description: flavor type - default: a1.Small - flavor_smp_id: - type: string - description: flavor type - default: a1.Small - flavor_db_id: - type: string - description: flavor type - default: a1.Small - image_scp_be_id: - type: string - description: Image use to boot a server - default: asc_base_image_be - image_scp_fe_id: - type: string - description: Image use to boot a server - default: asc_base_image_fe - image_smp_id: - type: string - description: Image use to boot a server - default: asc_base_image_smp - image_db_id: - type: string - description: Image use to boot a server - default: asc_base_image_db - - int_vscp_fe_cluster_net_id: - type: string - description: LAN2 FE Cluster/KA - int_vscp_fe_cluster_cidr: - type: string - description: Private Network2 Address (CIDR notation) - int_vscp_cluster_net_id: - type: string - description: LAN3 Cluster - int_vscp_cluster_cidr: - type: string - description: Private Network3 Address (CIDR notation) - int_vscp_db_network_net_id: - type: string - description: LAN4 DB - int_vscp_db_network_cidr: - type: string - description: Private Network4 Address (CIDR notation) - SIGNET_vrf_A1_direct_net_id: - type: string - description: Network name for SIGTRAN_A - SIGNET_vrf_B1_direct_net_id: - type: string - description: Network name for SIGTRAN_B - Cricket_OCS_protected_net_id: - type: string - description: Network name for CRICKET_OCS - OAM_direct_net_id: - type: string - description: Network name for OAM - be0_Cricket_OCS_protected_ips: - type: string - label: be0 port 5 OAM ip address - description: be0 port 5 OAM ip address - be1_Cricket_OCS_protected_ips: - type: string - label: be1 port 5 OAM ip address - description: be1 port 5 OAM ip address - be2_Cricket_OCS_protected_ips: - type: string - label: be2 port 5 OAM ip address - description: be2 port 5 OAM ip address - be3_Cricket_OCS_protected_ips: - type: string - label: be3 port 5 OAM ip address - description: be3 port 5 OAM ip address - be4_Cricket_OCS_protected_ips: - type: string - label: be4 port 5 OAM ip address - description: be4 port 5 OAM ip address - be0_OAM_direct_ips: - type: string - label: be0 port 7 OAM ip address - description: be0 port 7 OAM ip address - be1_OAM_direct_ips: - type: string - label: be1 port 7 OAM ip address - description: be1 port 7 OAM ip address - be2_OAM_direct_ips: - type: string - label: be2 port 7 OAM ip address - description: be2 port 7 OAM ip address - be3_OAM_direct_ips: - type: string - label: be3 port 7 OAM ip address - description: be3 port 7 OAM ip address - be4_OAM_direct_ips: - type: string - label: be4 port 7 OAM ip address - description: be4 port 7 OAM ip address - fe0_SIGNET_vrf_A1_direct_ips: - type: string - label: fe0 port 0 SIGTRAN ip address - description: fe0 port 0 SIGTRAN ip address - fe0_OAM_direct_ips: - type: string - label: fe0 port 7 OAM ip address - description: fe0 port 7 OAM ip address - fe1_SIGNET_vrf_B1_direct_ips: - type: string - label: fe1 port 1 SIGTRAN ip address - description: fe1 port 1 SIGTRAN ip address - fe1_OAM_direct_ips: - type: string - label: fe1 port 7 OAM ip address - description: fe1 port 7 OAM ip address - smp0_OAM_direct_ips: - type: string - label: smp0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - smp1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: smp1 port 7 OAM ip address - db0_OAM_direct_ips: - type: string - label: db0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - db1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: db1 port 7 OAM ip address - vm_scp_be0_name: - type: string - default: vSCP_BE0 - description: name of VM - vm_scp_be1_name: - type: string - default: vSCP_BE1 - description: name of VM - vm_scp_be2_name: - type: string - default: vSCP_BE2 - description: name of VM - vm_scp_be3_name: - type: string - default: vSCP_BE3 - description: name of VM - vm_scp_be4_name: - type: string - default: vSCP_BE4 - description: name of VM - vm_scp_fe0_name: - type: string - default: vSCP_FE0 - description: name of VM - vm_scp_fe1_name: - type: string - default: vSCP_FE1 - description: name of VM - vm_smp0_name: - type: string - default: vSMP0 - description: name of VM - vm_smp1_name: - type: string - default: vSMP1 - description: name of VM - vm_db0_name: - type: string - default: vDB0 - description: name of VM - vm_db1_name: - type: string - default: vDB1 - description: name of VM - -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be0_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be0_Cricket_OCS_protected_ips}}] - - be0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be0_OAM_direct_ips}}] - - server_scp_be1: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be1_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be1 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be1_port_3 } - - port: { get_resource: be1_port_4 } - - port: { get_resource: be1_port_5 } - - port: { get_resource: be1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be1_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be1_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] - - be1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] - - server_scp_be2: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be2_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be2 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be2_port_3 } - - port: { get_resource: be2_port_4 } - - port: { get_resource: be2_port_5 } - - port: { get_resource: be2_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be2_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be2_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be2_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be2_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] - - be2_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] - - server_scp_be3: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be3_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be3 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be3_port_3 } - - port: { get_resource: be3_port_4 } - - port: { get_resource: be3_port_5 } - - port: { get_resource: be3_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be3_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be3_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be3_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be3_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] - - be3_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] - - server_scp_be4: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be4_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be4 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be4_port_3 } - - port: { get_resource: be4_port_4 } - - port: { get_resource: be4_port_5 } - - port: { get_resource: be4_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be4_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be4_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be4_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be4_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] - - be4_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] - - server_scp_fe0: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe0_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe0 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe0_port_0 } - - port: { get_resource: fe0_port_2 } - - port: { get_resource: fe0_port_3 } - - port: { get_resource: fe0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe0_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe0_port_0: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_A1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] - - fe0_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] - - server_scp_fe1: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe1_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe1 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe1_port_1 } - - port: { get_resource: fe1_port_2 } - - port: { get_resource: fe1_port_3 } - - port: { get_resource: fe1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe1_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe1_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_B1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] - - fe1_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] - - server_smp0: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp0_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp0 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp0_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] - - server_smp1: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp1_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp1 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp1_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] - - server_db0: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db0_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db0 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db0_port_4 } - - port: { get_resource: db0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db0_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] - - server_db1: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db1_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db1 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db1_port_4 } - - port: { get_resource: db1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db1_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat 0 2.zip b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat 0 2.zip deleted file mode 100644 index c8a2726421..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat 0 2.zip and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat_net 0 2.yaml b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat_net 0 2.yaml deleted file mode 100644 index 6835485ca1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/asc_heat_net 0 2.yaml +++ /dev/null @@ -1,787 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: -# availability_zone_smp0: -# type: string -# default: nova -# availability_zone_smp1: -# type: string -# default: nova -# availability_zone_fe0: -# type: string -# default: nova -# availability_zone_fe1: -# type: string -# default: nova -# availability_zone_db0: -# type: string -# default: nova -# availability_zone_db1: -# type: string -# default: nova -# availability_zone_be0: -# type: string -# default: nova -# availability_zone_be1: -# type: string -# default: nova -# availability_zone_be2: -# type: string -# default: nova -# availability_zone_be3: -# type: string -# default: nova -# availability_zone_be4: -# type: string -# default: nova - - vnf_name: - type: string - description: Unique name for this VNF instance - default: This_is_the_SCP_name - vnf_id: - type: string - description: Unique ID for this VNF instance - default: This_is_ths_SCP_id - - flavor_scp_be_id: - type: string - description: flavor type - default: a1.Small - flavor_scp_fe_id: - type: string - description: flavor type - default: a1.Small - flavor_smp_id: - type: string - description: flavor type - default: a1.Small - flavor_db_id: - type: string - description: flavor type - default: a1.Small - image_scp_be_id: - type: string - description: Image use to boot a server - default: asc_base_image_be - image_scp_fe_id: - type: string - description: Image use to boot a server - default: asc_base_image_fe - image_smp_id: - type: string - description: Image use to boot a server - default: asc_base_image_smp - image_db_id: - type: string - description: Image use to boot a server - default: asc_base_image_db - - int_vscp_fe_cluster_net_id: - type: string - description: LAN2 FE Cluster/KA - int_vscp_fe_cluster_cidr: - type: string - description: Private Network2 Address (CIDR notation) - int_vscp_cluster_net_id: - type: string - description: LAN3 Cluster - int_vscp_cluster_cidr: - type: string - description: Private Network3 Address (CIDR notation) - int_vscp_db_network_net_id: - type: string - description: LAN4 DB - int_vscp_db_network_cidr: - type: string - description: Private Network4 Address (CIDR notation) - SIGNET_vrf_A1_direct_net_id: - type: string - description: Network name for SIGTRAN_A - SIGNET_vrf_B1_direct_net_id: - type: string - description: Network name for SIGTRAN_B - Cricket_OCS_protected_net_id: - type: string - description: Network name for CRICKET_OCS - OAM_direct_net_id: - type: string - description: Network name for OAM - be0_Cricket_OCS_protected_ips: - type: string - label: be0 port 5 OAM ip address - description: be0 port 5 OAM ip address - be1_Cricket_OCS_protected_ips: - type: string - label: be1 port 5 OAM ip address - description: be1 port 5 OAM ip address - be2_Cricket_OCS_protected_ips: - type: string - label: be2 port 5 OAM ip address - description: be2 port 5 OAM ip address - be3_Cricket_OCS_protected_ips: - type: string - label: be3 port 5 OAM ip address - description: be3 port 5 OAM ip address - be4_Cricket_OCS_protected_ips: - type: string - label: be4 port 5 OAM ip address - description: be4 port 5 OAM ip address - be0_OAM_direct_ips: - type: string - label: be0 port 7 OAM ip address - description: be0 port 7 OAM ip address - be1_OAM_direct_ips: - type: string - label: be1 port 7 OAM ip address - description: be1 port 7 OAM ip address - be2_OAM_direct_ips: - type: string - label: be2 port 7 OAM ip address - description: be2 port 7 OAM ip address - be3_OAM_direct_ips: - type: string - label: be3 port 7 OAM ip address - description: be3 port 7 OAM ip address - be4_OAM_direct_ips: - type: string - label: be4 port 7 OAM ip address - description: be4 port 7 OAM ip address - fe0_SIGNET_vrf_A1_direct_ips: - type: string - label: fe0 port 0 SIGTRAN ip address - description: fe0 port 0 SIGTRAN ip address - fe0_OAM_direct_ips: - type: string - label: fe0 port 7 OAM ip address - description: fe0 port 7 OAM ip address - fe1_SIGNET_vrf_B1_direct_ips: - type: string - label: fe1 port 1 SIGTRAN ip address - description: fe1 port 1 SIGTRAN ip address - fe1_OAM_direct_ips: - type: string - label: fe1 port 7 OAM ip address - description: fe1 port 7 OAM ip address - smp0_OAM_direct_ips: - type: string - label: smp0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - smp1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: smp1 port 7 OAM ip address - db0_OAM_direct_ips: - type: string - label: db0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - db1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: db1 port 7 OAM ip address - vm_scp_be0_name: - type: string - default: vSCP_BE0 - description: name of VM - vm_scp_be1_name: - type: string - default: vSCP_BE1 - description: name of VM - vm_scp_be2_name: - type: string - default: vSCP_BE2 - description: name of VM - vm_scp_be3_name: - type: string - default: vSCP_BE3 - description: name of VM - vm_scp_be4_name: - type: string - default: vSCP_BE4 - description: name of VM - vm_scp_fe0_name: - type: string - default: vSCP_FE0 - description: name of VM - vm_scp_fe1_name: - type: string - default: vSCP_FE1 - description: name of VM - vm_smp0_name: - type: string - default: vSMP0 - description: name of VM - vm_smp1_name: - type: string - default: vSMP1 - description: name of VM - vm_db0_name: - type: string - default: vDB0 - description: name of VM - vm_db1_name: - type: string - default: vDB1 - description: name of VM - -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be0_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be0_Cricket_OCS_protected_ips}}] - - be0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be0_OAM_direct_ips}}] - - server_scp_be1: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be1_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be1 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be1_port_3 } - - port: { get_resource: be1_port_4 } - - port: { get_resource: be1_port_5 } - - port: { get_resource: be1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be1_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be1_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] - - be1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] - - server_scp_be2: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be2_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be2 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be2_port_3 } - - port: { get_resource: be2_port_4 } - - port: { get_resource: be2_port_5 } - - port: { get_resource: be2_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be2_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be2_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be2_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be2_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] - - be2_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] - - server_scp_be3: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be3_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be3 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be3_port_3 } - - port: { get_resource: be3_port_4 } - - port: { get_resource: be3_port_5 } - - port: { get_resource: be3_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be3_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be3_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be3_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be3_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] - - be3_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] - - server_scp_be4: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be4_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be4 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be4_port_3 } - - port: { get_resource: be4_port_4 } - - port: { get_resource: be4_port_5 } - - port: { get_resource: be4_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be4_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be4_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be4_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be4_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] - - be4_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] - - server_scp_fe0: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe0_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe0 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe0_port_0 } - - port: { get_resource: fe0_port_2 } - - port: { get_resource: fe0_port_3 } - - port: { get_resource: fe0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe0_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe0_port_0: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_A1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] - - fe0_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] - - server_scp_fe1: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe1_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe1 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe1_port_1 } - - port: { get_resource: fe1_port_2 } - - port: { get_resource: fe1_port_3 } - - port: { get_resource: fe1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe1_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe1_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_B1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] - - fe1_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] - - server_smp0: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp0_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp0 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp0_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] - - server_smp1: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp1_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp1 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp1_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] - - server_db0: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db0_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db0 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db0_port_4 } - - port: { get_resource: db0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db0_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] - - server_db1: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db1_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db1 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db1_port_4 } - - port: { get_resource: db1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db1_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heatEnvfile.env b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heatEnvfile.env deleted file mode 100644 index 6835485ca1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heatEnvfile.env +++ /dev/null @@ -1,787 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: -# availability_zone_smp0: -# type: string -# default: nova -# availability_zone_smp1: -# type: string -# default: nova -# availability_zone_fe0: -# type: string -# default: nova -# availability_zone_fe1: -# type: string -# default: nova -# availability_zone_db0: -# type: string -# default: nova -# availability_zone_db1: -# type: string -# default: nova -# availability_zone_be0: -# type: string -# default: nova -# availability_zone_be1: -# type: string -# default: nova -# availability_zone_be2: -# type: string -# default: nova -# availability_zone_be3: -# type: string -# default: nova -# availability_zone_be4: -# type: string -# default: nova - - vnf_name: - type: string - description: Unique name for this VNF instance - default: This_is_the_SCP_name - vnf_id: - type: string - description: Unique ID for this VNF instance - default: This_is_ths_SCP_id - - flavor_scp_be_id: - type: string - description: flavor type - default: a1.Small - flavor_scp_fe_id: - type: string - description: flavor type - default: a1.Small - flavor_smp_id: - type: string - description: flavor type - default: a1.Small - flavor_db_id: - type: string - description: flavor type - default: a1.Small - image_scp_be_id: - type: string - description: Image use to boot a server - default: asc_base_image_be - image_scp_fe_id: - type: string - description: Image use to boot a server - default: asc_base_image_fe - image_smp_id: - type: string - description: Image use to boot a server - default: asc_base_image_smp - image_db_id: - type: string - description: Image use to boot a server - default: asc_base_image_db - - int_vscp_fe_cluster_net_id: - type: string - description: LAN2 FE Cluster/KA - int_vscp_fe_cluster_cidr: - type: string - description: Private Network2 Address (CIDR notation) - int_vscp_cluster_net_id: - type: string - description: LAN3 Cluster - int_vscp_cluster_cidr: - type: string - description: Private Network3 Address (CIDR notation) - int_vscp_db_network_net_id: - type: string - description: LAN4 DB - int_vscp_db_network_cidr: - type: string - description: Private Network4 Address (CIDR notation) - SIGNET_vrf_A1_direct_net_id: - type: string - description: Network name for SIGTRAN_A - SIGNET_vrf_B1_direct_net_id: - type: string - description: Network name for SIGTRAN_B - Cricket_OCS_protected_net_id: - type: string - description: Network name for CRICKET_OCS - OAM_direct_net_id: - type: string - description: Network name for OAM - be0_Cricket_OCS_protected_ips: - type: string - label: be0 port 5 OAM ip address - description: be0 port 5 OAM ip address - be1_Cricket_OCS_protected_ips: - type: string - label: be1 port 5 OAM ip address - description: be1 port 5 OAM ip address - be2_Cricket_OCS_protected_ips: - type: string - label: be2 port 5 OAM ip address - description: be2 port 5 OAM ip address - be3_Cricket_OCS_protected_ips: - type: string - label: be3 port 5 OAM ip address - description: be3 port 5 OAM ip address - be4_Cricket_OCS_protected_ips: - type: string - label: be4 port 5 OAM ip address - description: be4 port 5 OAM ip address - be0_OAM_direct_ips: - type: string - label: be0 port 7 OAM ip address - description: be0 port 7 OAM ip address - be1_OAM_direct_ips: - type: string - label: be1 port 7 OAM ip address - description: be1 port 7 OAM ip address - be2_OAM_direct_ips: - type: string - label: be2 port 7 OAM ip address - description: be2 port 7 OAM ip address - be3_OAM_direct_ips: - type: string - label: be3 port 7 OAM ip address - description: be3 port 7 OAM ip address - be4_OAM_direct_ips: - type: string - label: be4 port 7 OAM ip address - description: be4 port 7 OAM ip address - fe0_SIGNET_vrf_A1_direct_ips: - type: string - label: fe0 port 0 SIGTRAN ip address - description: fe0 port 0 SIGTRAN ip address - fe0_OAM_direct_ips: - type: string - label: fe0 port 7 OAM ip address - description: fe0 port 7 OAM ip address - fe1_SIGNET_vrf_B1_direct_ips: - type: string - label: fe1 port 1 SIGTRAN ip address - description: fe1 port 1 SIGTRAN ip address - fe1_OAM_direct_ips: - type: string - label: fe1 port 7 OAM ip address - description: fe1 port 7 OAM ip address - smp0_OAM_direct_ips: - type: string - label: smp0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - smp1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: smp1 port 7 OAM ip address - db0_OAM_direct_ips: - type: string - label: db0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - db1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: db1 port 7 OAM ip address - vm_scp_be0_name: - type: string - default: vSCP_BE0 - description: name of VM - vm_scp_be1_name: - type: string - default: vSCP_BE1 - description: name of VM - vm_scp_be2_name: - type: string - default: vSCP_BE2 - description: name of VM - vm_scp_be3_name: - type: string - default: vSCP_BE3 - description: name of VM - vm_scp_be4_name: - type: string - default: vSCP_BE4 - description: name of VM - vm_scp_fe0_name: - type: string - default: vSCP_FE0 - description: name of VM - vm_scp_fe1_name: - type: string - default: vSCP_FE1 - description: name of VM - vm_smp0_name: - type: string - default: vSMP0 - description: name of VM - vm_smp1_name: - type: string - default: vSMP1 - description: name of VM - vm_db0_name: - type: string - default: vDB0 - description: name of VM - vm_db1_name: - type: string - default: vDB1 - description: name of VM - -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be0_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be0_Cricket_OCS_protected_ips}}] - - be0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be0_OAM_direct_ips}}] - - server_scp_be1: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be1_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be1 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be1_port_3 } - - port: { get_resource: be1_port_4 } - - port: { get_resource: be1_port_5 } - - port: { get_resource: be1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be1_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be1_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] - - be1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] - - server_scp_be2: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be2_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be2 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be2_port_3 } - - port: { get_resource: be2_port_4 } - - port: { get_resource: be2_port_5 } - - port: { get_resource: be2_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be2_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be2_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be2_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be2_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] - - be2_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] - - server_scp_be3: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be3_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be3 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be3_port_3 } - - port: { get_resource: be3_port_4 } - - port: { get_resource: be3_port_5 } - - port: { get_resource: be3_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be3_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be3_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be3_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be3_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] - - be3_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] - - server_scp_be4: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be4_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be4 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be4_port_3 } - - port: { get_resource: be4_port_4 } - - port: { get_resource: be4_port_5 } - - port: { get_resource: be4_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be4_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be4_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be4_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be4_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] - - be4_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] - - server_scp_fe0: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe0_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe0 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe0_port_0 } - - port: { get_resource: fe0_port_2 } - - port: { get_resource: fe0_port_3 } - - port: { get_resource: fe0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe0_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe0_port_0: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_A1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] - - fe0_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] - - server_scp_fe1: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe1_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe1 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe1_port_1 } - - port: { get_resource: fe1_port_2 } - - port: { get_resource: fe1_port_3 } - - port: { get_resource: fe1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe1_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe1_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_B1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] - - fe1_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] - - server_smp0: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp0_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp0 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp0_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] - - server_smp1: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp1_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp1 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp1_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] - - server_db0: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db0_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db0 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db0_port_4 } - - port: { get_resource: db0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db0_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] - - server_db1: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db1_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db1 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db1_port_4 } - - port: { get_resource: db1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db1_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heatInvalidFormat.yaml b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heatInvalidFormat.yaml deleted file mode 100644 index b70d5a4b0a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heatInvalidFormat.yaml +++ /dev/null @@ -1,9 +0,0 @@ -heat_template_version: 2013-05-23 - -parameters: - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heat_mini.yaml b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heat_mini.yaml deleted file mode 100644 index a545569129..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/heat_mini.yaml +++ /dev/null @@ -1,13 +0,0 @@ -heat_template_version: 2013-05-23 - -parameters: - vnf_name: - type: string - description: Unique name for this VNF instance - default: This_is_the_SCP_name - -resources: - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidJson.json b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidJson.json deleted file mode 100644 index 48a3e89deb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidJson.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "glossary": { - "title": "example glossary", - "GlossDiv": { - "title": "S", - "GlossList": { - "GlossEntry": { - "ID": "SGML", - "SortAs": "SGML", - "GlossTerm": "Standard Generalized Markup Language", - "Acronym": "SGML", diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidYamlFormat.yaml b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidYamlFormat.yaml deleted file mode 100644 index 5c51039931..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidYamlFormat.yaml +++ /dev/null @@ -1,787 +0,0 @@ - heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: -# availability_zone_smp0: -# type: string -# default: nova -# availability_zone_smp1: -# type: string -# default: nova -# availability_zone_fe0: -# type: string -# default: nova -# availability_zone_fe1: -# type: string -# default: nova -# availability_zone_db0: -# type: string -# default: nova -# availability_zone_db1: -# type: string -# default: nova -# availability_zone_be0: -# type: string -# default: nova -# availability_zone_be1: -# type: string -# default: nova -# availability_zone_be2: -# type: string -# default: nova -# availability_zone_be3: -# type: string -# default: nova -# availability_zone_be4: -# type: string -# default: nova - - vnf_name: - type: string - description: Unique name for this VNF instance - default: This_is_the_SCP_name - vnf_id: - type: string - description: Unique ID for this VNF instance - default: This_is_ths_SCP_id - - flavor_scp_be_id: - type: string - description: flavor type - default: a1.Small - flavor_scp_fe_id: - type: string - description: flavor type - default: a1.Small - flavor_smp_id: - type: string - description: flavor type - default: a1.Small - flavor_db_id: - type: string - description: flavor type - default: a1.Small - image_scp_be_id: - type: string - description: Image use to boot a server - default: asc_base_image_be - image_scp_fe_id: - type: string - description: Image use to boot a server - default: asc_base_image_fe - image_smp_id: - type: string - description: Image use to boot a server - default: asc_base_image_smp - image_db_id: - type: string - description: Image use to boot a server - default: asc_base_image_db - - int_vscp_fe_cluster_net_id: - type: string - description: LAN2 FE Cluster/KA - int_vscp_fe_cluster_cidr: - type: string - description: Private Network2 Address (CIDR notation) - int_vscp_cluster_net_id: - type: string - description: LAN3 Cluster - int_vscp_cluster_cidr: - type: string - description: Private Network3 Address (CIDR notation) - int_vscp_db_network_net_id: - type: string - description: LAN4 DB - int_vscp_db_network_cidr: - type: string - description: Private Network4 Address (CIDR notation) - SIGNET_vrf_A1_direct_net_id: - type: string - description: Network name for SIGTRAN_A - SIGNET_vrf_B1_direct_net_id: - type: string - description: Network name for SIGTRAN_B - Cricket_OCS_protected_net_id: - type: string - description: Network name for CRICKET_OCS - OAM_direct_net_id: - type: string - description: Network name for OAM - be0_Cricket_OCS_protected_ips: - type: string - label: be0 port 5 OAM ip address - description: be0 port 5 OAM ip address - be1_Cricket_OCS_protected_ips: - type: string - label: be1 port 5 OAM ip address - description: be1 port 5 OAM ip address - be2_Cricket_OCS_protected_ips: - type: string - label: be2 port 5 OAM ip address - description: be2 port 5 OAM ip address - be3_Cricket_OCS_protected_ips: - type: string - label: be3 port 5 OAM ip address - description: be3 port 5 OAM ip address - be4_Cricket_OCS_protected_ips: - type: string - label: be4 port 5 OAM ip address - description: be4 port 5 OAM ip address - be0_OAM_direct_ips: - type: string - label: be0 port 7 OAM ip address - description: be0 port 7 OAM ip address - be1_OAM_direct_ips: - type: string - label: be1 port 7 OAM ip address - description: be1 port 7 OAM ip address - be2_OAM_direct_ips: - type: string - label: be2 port 7 OAM ip address - description: be2 port 7 OAM ip address - be3_OAM_direct_ips: - type: string - label: be3 port 7 OAM ip address - description: be3 port 7 OAM ip address - be4_OAM_direct_ips: - type: string - label: be4 port 7 OAM ip address - description: be4 port 7 OAM ip address - fe0_SIGNET_vrf_A1_direct_ips: - type: string - label: fe0 port 0 SIGTRAN ip address - description: fe0 port 0 SIGTRAN ip address - fe0_OAM_direct_ips: - type: string - label: fe0 port 7 OAM ip address - description: fe0 port 7 OAM ip address - fe1_SIGNET_vrf_B1_direct_ips: - type: string - label: fe1 port 1 SIGTRAN ip address - description: fe1 port 1 SIGTRAN ip address - fe1_OAM_direct_ips: - type: string - label: fe1 port 7 OAM ip address - description: fe1 port 7 OAM ip address - smp0_OAM_direct_ips: - type: string - label: smp0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - smp1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: smp1 port 7 OAM ip address - db0_OAM_direct_ips: - type: string - label: db0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - db1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: db1 port 7 OAM ip address - vm_scp_be0_name: - type: string - default: vSCP_BE0 - description: name of VM - vm_scp_be1_name: - type: string - default: vSCP_BE1 - description: name of VM - vm_scp_be2_name: - type: string - default: vSCP_BE2 - description: name of VM - vm_scp_be3_name: - type: string - default: vSCP_BE3 - description: name of VM - vm_scp_be4_name: - type: string - default: vSCP_BE4 - description: name of VM - vm_scp_fe0_name: - type: string - default: vSCP_FE0 - description: name of VM - vm_scp_fe1_name: - type: string - default: vSCP_FE1 - description: name of VM - vm_smp0_name: - type: string - default: vSMP0 - description: name of VM - vm_smp1_name: - type: string - default: vSMP1 - description: name of VM - vm_db0_name: - type: string - default: vDB0 - description: name of VM - vm_db1_name: - type: string - default: vDB1 - description: name of VM - -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be0_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be0_Cricket_OCS_protected_ips}}] - - be0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be0_OAM_direct_ips}}] - - server_scp_be1: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be1_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be1 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be1_port_3 } - - port: { get_resource: be1_port_4 } - - port: { get_resource: be1_port_5 } - - port: { get_resource: be1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be1_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be1_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] - - be1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] - - server_scp_be2: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be2_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be2 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be2_port_3 } - - port: { get_resource: be2_port_4 } - - port: { get_resource: be2_port_5 } - - port: { get_resource: be2_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be2_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be2_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be2_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be2_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] - - be2_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] - - server_scp_be3: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be3_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be3 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be3_port_3 } - - port: { get_resource: be3_port_4 } - - port: { get_resource: be3_port_5 } - - port: { get_resource: be3_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be3_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be3_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be3_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be3_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] - - be3_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] - - server_scp_be4: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be4_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be4 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be4_port_3 } - - port: { get_resource: be4_port_4 } - - port: { get_resource: be4_port_5 } - - port: { get_resource: be4_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be4_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be4_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be4_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be4_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] - - be4_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] - - server_scp_fe0: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe0_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe0 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe0_port_0 } - - port: { get_resource: fe0_port_2 } - - port: { get_resource: fe0_port_3 } - - port: { get_resource: fe0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe0_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe0_port_0: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_A1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] - - fe0_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] - - server_scp_fe1: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe1_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe1 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe1_port_1 } - - port: { get_resource: fe1_port_2 } - - port: { get_resource: fe1_port_3 } - - port: { get_resource: fe1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe1_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe1_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_B1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] - - fe1_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] - - server_smp0: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp0_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp0 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp0_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] - - server_smp1: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp1_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp1 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp1_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] - - server_db0: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db0_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db0 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db0_port_4 } - - port: { get_resource: db0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db0_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] - - server_db1: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db1_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db1 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db1_port_4 } - - port: { get_resource: db1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db1_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidYangXml.xml b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidYangXml.xml deleted file mode 100644 index 8978e0d5ed..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/invalidYangXml.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Lionel Andr�s Messi - 1987-06-24T00:00:00-00:00 - - - Cristiano Ronaldo - 1985-02-05T00:00:00-00:00 - - - FC Barcelona - - Lionel Andr�s Messi - Champions League 2014/2015 - 10 - 43 - - - - Real Madrid - - Cristiano Ronaldo - Champions League 2014/2015 - 7 - 48 - - - - - - - - \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/jsonArtifact.json b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/jsonArtifact.json deleted file mode 100644 index d5ca56d195..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/jsonArtifact.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "glossary": { - "title": "example glossary", - "GlossDiv": { - "title": "S", - "GlossList": { - "GlossEntry": { - "ID": "SGML", - "SortAs": "SGML", - "GlossTerm": "Standard Generalized Markup Language", - "Acronym": "SGML", - "Abbrev": "ISO 8879:1986", - "GlossDef": { - "para": "A meta-markup language, used to create markup languages such as DocBook.", - "GlossSeeAlso": ["GML", "XML"] - }, - "GlossSee": "markup" - } - } - } - } -} \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/other.txt b/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/other.txt deleted file mode 100644 index 5f8f77ca2c..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/HeatDeploymentArtifacts/other.txt +++ /dev/null @@ -1,3 +0,0 @@ -cmd1 -cmd2 -cmd3 \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/bluePrintSampleArtifact.xml b/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/bluePrintSampleArtifact.xml deleted file mode 100644 index 10c46b7269..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/bluePrintSampleArtifact.xml +++ /dev/null @@ -1,3 +0,0 @@ - - dfsfsdfsdf - \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/docSampleArtifact.docx b/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/docSampleArtifact.docx deleted file mode 100644 index c281f532f8..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/docSampleArtifact.docx and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/emfSampleArtifact.emf b/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/emfSampleArtifact.emf deleted file mode 100644 index 9c478f6ce1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/emfSampleArtifact.emf +++ /dev/null @@ -1,2 +0,0 @@ -This is sample EMF file -We currently not checking the file content. \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/emfSampleArtifact.xml b/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/emfSampleArtifact.xml deleted file mode 100644 index 10c46b7269..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/emfSampleArtifact.xml +++ /dev/null @@ -1,3 +0,0 @@ - - dfsfsdfsdf - \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/eventSampleArtifact.xml b/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/eventSampleArtifact.xml deleted file mode 100644 index 10c46b7269..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/eventSampleArtifact.xml +++ /dev/null @@ -1,3 +0,0 @@ - - dfsfsdfsdf - \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/jsonSampleArtifact.json b/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/jsonSampleArtifact.json deleted file mode 100644 index b749a9e89c..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/jsonSampleArtifact.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "test": "This is test" -} diff --git a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/toscaSampleArtifact.yml b/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/toscaSampleArtifact.yml deleted file mode 100644 index 10ccf71d51..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/ResourceInstanceArtifacts/toscaSampleArtifact.yml +++ /dev/null @@ -1,5 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 - -node_types: - org.openecomp.resource.cp.CP: - derived_from: org.openecomp.resource.cp.root \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/addHeatArtifactToServiceAndSertify/asc_heat 0 2.yaml b/test-apis-ci/src/test/resources/CI/tests/addHeatArtifactToServiceAndSertify/asc_heat 0 2.yaml deleted file mode 100644 index 6835485ca1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/addHeatArtifactToServiceAndSertify/asc_heat 0 2.yaml +++ /dev/null @@ -1,787 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: -# availability_zone_smp0: -# type: string -# default: nova -# availability_zone_smp1: -# type: string -# default: nova -# availability_zone_fe0: -# type: string -# default: nova -# availability_zone_fe1: -# type: string -# default: nova -# availability_zone_db0: -# type: string -# default: nova -# availability_zone_db1: -# type: string -# default: nova -# availability_zone_be0: -# type: string -# default: nova -# availability_zone_be1: -# type: string -# default: nova -# availability_zone_be2: -# type: string -# default: nova -# availability_zone_be3: -# type: string -# default: nova -# availability_zone_be4: -# type: string -# default: nova - - vnf_name: - type: string - description: Unique name for this VNF instance - default: This_is_the_SCP_name - vnf_id: - type: string - description: Unique ID for this VNF instance - default: This_is_ths_SCP_id - - flavor_scp_be_id: - type: string - description: flavor type - default: a1.Small - flavor_scp_fe_id: - type: string - description: flavor type - default: a1.Small - flavor_smp_id: - type: string - description: flavor type - default: a1.Small - flavor_db_id: - type: string - description: flavor type - default: a1.Small - image_scp_be_id: - type: string - description: Image use to boot a server - default: asc_base_image_be - image_scp_fe_id: - type: string - description: Image use to boot a server - default: asc_base_image_fe - image_smp_id: - type: string - description: Image use to boot a server - default: asc_base_image_smp - image_db_id: - type: string - description: Image use to boot a server - default: asc_base_image_db - - int_vscp_fe_cluster_net_id: - type: string - description: LAN2 FE Cluster/KA - int_vscp_fe_cluster_cidr: - type: string - description: Private Network2 Address (CIDR notation) - int_vscp_cluster_net_id: - type: string - description: LAN3 Cluster - int_vscp_cluster_cidr: - type: string - description: Private Network3 Address (CIDR notation) - int_vscp_db_network_net_id: - type: string - description: LAN4 DB - int_vscp_db_network_cidr: - type: string - description: Private Network4 Address (CIDR notation) - SIGNET_vrf_A1_direct_net_id: - type: string - description: Network name for SIGTRAN_A - SIGNET_vrf_B1_direct_net_id: - type: string - description: Network name for SIGTRAN_B - Cricket_OCS_protected_net_id: - type: string - description: Network name for CRICKET_OCS - OAM_direct_net_id: - type: string - description: Network name for OAM - be0_Cricket_OCS_protected_ips: - type: string - label: be0 port 5 OAM ip address - description: be0 port 5 OAM ip address - be1_Cricket_OCS_protected_ips: - type: string - label: be1 port 5 OAM ip address - description: be1 port 5 OAM ip address - be2_Cricket_OCS_protected_ips: - type: string - label: be2 port 5 OAM ip address - description: be2 port 5 OAM ip address - be3_Cricket_OCS_protected_ips: - type: string - label: be3 port 5 OAM ip address - description: be3 port 5 OAM ip address - be4_Cricket_OCS_protected_ips: - type: string - label: be4 port 5 OAM ip address - description: be4 port 5 OAM ip address - be0_OAM_direct_ips: - type: string - label: be0 port 7 OAM ip address - description: be0 port 7 OAM ip address - be1_OAM_direct_ips: - type: string - label: be1 port 7 OAM ip address - description: be1 port 7 OAM ip address - be2_OAM_direct_ips: - type: string - label: be2 port 7 OAM ip address - description: be2 port 7 OAM ip address - be3_OAM_direct_ips: - type: string - label: be3 port 7 OAM ip address - description: be3 port 7 OAM ip address - be4_OAM_direct_ips: - type: string - label: be4 port 7 OAM ip address - description: be4 port 7 OAM ip address - fe0_SIGNET_vrf_A1_direct_ips: - type: string - label: fe0 port 0 SIGTRAN ip address - description: fe0 port 0 SIGTRAN ip address - fe0_OAM_direct_ips: - type: string - label: fe0 port 7 OAM ip address - description: fe0 port 7 OAM ip address - fe1_SIGNET_vrf_B1_direct_ips: - type: string - label: fe1 port 1 SIGTRAN ip address - description: fe1 port 1 SIGTRAN ip address - fe1_OAM_direct_ips: - type: string - label: fe1 port 7 OAM ip address - description: fe1 port 7 OAM ip address - smp0_OAM_direct_ips: - type: string - label: smp0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - smp1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: smp1 port 7 OAM ip address - db0_OAM_direct_ips: - type: string - label: db0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - db1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: db1 port 7 OAM ip address - vm_scp_be0_name: - type: string - default: vSCP_BE0 - description: name of VM - vm_scp_be1_name: - type: string - default: vSCP_BE1 - description: name of VM - vm_scp_be2_name: - type: string - default: vSCP_BE2 - description: name of VM - vm_scp_be3_name: - type: string - default: vSCP_BE3 - description: name of VM - vm_scp_be4_name: - type: string - default: vSCP_BE4 - description: name of VM - vm_scp_fe0_name: - type: string - default: vSCP_FE0 - description: name of VM - vm_scp_fe1_name: - type: string - default: vSCP_FE1 - description: name of VM - vm_smp0_name: - type: string - default: vSMP0 - description: name of VM - vm_smp1_name: - type: string - default: vSMP1 - description: name of VM - vm_db0_name: - type: string - default: vDB0 - description: name of VM - vm_db1_name: - type: string - default: vDB1 - description: name of VM - -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be0_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be0_Cricket_OCS_protected_ips}}] - - be0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be0_OAM_direct_ips}}] - - server_scp_be1: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be1_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be1 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be1_port_3 } - - port: { get_resource: be1_port_4 } - - port: { get_resource: be1_port_5 } - - port: { get_resource: be1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be1_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be1_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] - - be1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] - - server_scp_be2: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be2_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be2 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be2_port_3 } - - port: { get_resource: be2_port_4 } - - port: { get_resource: be2_port_5 } - - port: { get_resource: be2_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be2_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be2_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be2_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be2_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] - - be2_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] - - server_scp_be3: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be3_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be3 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be3_port_3 } - - port: { get_resource: be3_port_4 } - - port: { get_resource: be3_port_5 } - - port: { get_resource: be3_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be3_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be3_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be3_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be3_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] - - be3_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] - - server_scp_be4: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be4_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be4 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be4_port_3 } - - port: { get_resource: be4_port_4 } - - port: { get_resource: be4_port_5 } - - port: { get_resource: be4_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be4_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be4_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be4_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be4_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] - - be4_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] - - server_scp_fe0: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe0_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe0 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe0_port_0 } - - port: { get_resource: fe0_port_2 } - - port: { get_resource: fe0_port_3 } - - port: { get_resource: fe0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe0_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe0_port_0: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_A1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] - - fe0_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] - - server_scp_fe1: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe1_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe1 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe1_port_1 } - - port: { get_resource: fe1_port_2 } - - port: { get_resource: fe1_port_3 } - - port: { get_resource: fe1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe1_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe1_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_B1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] - - fe1_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] - - server_smp0: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp0_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp0 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp0_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] - - server_smp1: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp1_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp1 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp1_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] - - server_db0: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db0_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db0 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db0_port_4 } - - port: { get_resource: db0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db0_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] - - server_db1: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db1_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db1 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db1_port_4 } - - port: { get_resource: db1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db1_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/downloadResourceArtifactSuccess/org.openstack.Rally.zip b/test-apis-ci/src/test/resources/CI/tests/downloadResourceArtifactSuccess/org.openstack.Rally.zip deleted file mode 100644 index 0951d5cef8..0000000000 Binary files a/test-apis-ci/src/test/resources/CI/tests/downloadResourceArtifactSuccess/org.openstack.Rally.zip and /dev/null differ diff --git a/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingDefault.yaml b/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingDefault.yaml deleted file mode 100644 index 6aad589bdb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingDefault.yaml +++ /dev/null @@ -1,603 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: -# availability_zone_smp0: -# type: string -# default: nova -# availability_zone_smp1: -# type: string -# default: nova -# availability_zone_fe0: -# type: string -# default: nova -# availability_zone_fe1: -# type: string -# default: nova -# availability_zone_db0: -# type: string -# default: nova -# availability_zone_db1: -# type: string -# default: nova -# availability_zone_be0: -# type: string -# default: nova -# availability_zone_be1: -# type: string -# default: nova -# availability_zone_be2: -# type: string -# default: nova -# availability_zone_be3: -# type: string -# default: nova -# availability_zone_be4: -# type: string -# default: nova - - vnf_missing_default: - type: string - description: Unique name for this VNF instance - label: be4 port 5 OAM ip address - -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be0_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be0_Cricket_OCS_protected_ips}}] - - be0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be0_OAM_direct_ips}}] - - server_scp_be1: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be1_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be1 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be1_port_3 } - - port: { get_resource: be1_port_4 } - - port: { get_resource: be1_port_5 } - - port: { get_resource: be1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be1_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be1_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] - - be1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] - - server_scp_be2: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be2_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be2 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be2_port_3 } - - port: { get_resource: be2_port_4 } - - port: { get_resource: be2_port_5 } - - port: { get_resource: be2_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be2_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be2_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be2_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be2_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] - - be2_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] - - server_scp_be3: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be3_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be3 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be3_port_3 } - - port: { get_resource: be3_port_4 } - - port: { get_resource: be3_port_5 } - - port: { get_resource: be3_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be3_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be3_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be3_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be3_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] - - be3_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] - - server_scp_be4: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be4_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be4 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be4_port_3 } - - port: { get_resource: be4_port_4 } - - port: { get_resource: be4_port_5 } - - port: { get_resource: be4_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be4_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be4_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be4_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be4_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] - - be4_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] - - server_scp_fe0: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe0_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe0 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe0_port_0 } - - port: { get_resource: fe0_port_2 } - - port: { get_resource: fe0_port_3 } - - port: { get_resource: fe0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe0_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe0_port_0: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_A1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] - - fe0_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] - - server_scp_fe1: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe1_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe1 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe1_port_1 } - - port: { get_resource: fe1_port_2 } - - port: { get_resource: fe1_port_3 } - - port: { get_resource: fe1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe1_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe1_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_B1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] - - fe1_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] - - server_smp0: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp0_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp0 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp0_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] - - server_smp1: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp1_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp1 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp1_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] - - server_db0: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db0_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db0 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db0_port_4 } - - port: { get_resource: db0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db0_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] - - server_db1: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db1_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db1 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db1_port_4 } - - port: { get_resource: db1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db1_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingDesc.yaml b/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingDesc.yaml deleted file mode 100644 index d51a20d77f..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingDesc.yaml +++ /dev/null @@ -1,603 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: -# availability_zone_smp0: -# type: string -# default: nova -# availability_zone_smp1: -# type: string -# default: nova -# availability_zone_fe0: -# type: string -# default: nova -# availability_zone_fe1: -# type: string -# default: nova -# availability_zone_db0: -# type: string -# default: nova -# availability_zone_db1: -# type: string -# default: nova -# availability_zone_be0: -# type: string -# default: nova -# availability_zone_be1: -# type: string -# default: nova -# availability_zone_be2: -# type: string -# default: nova -# availability_zone_be3: -# type: string -# default: nova -# availability_zone_be4: -# type: string -# default: nova - - vnf_missing_desc: - type: string - default: This_is_the_SCP_name - label: be4 port 5 OAM ip address - -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be0_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be0_Cricket_OCS_protected_ips}}] - - be0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be0_OAM_direct_ips}}] - - server_scp_be1: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be1_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be1 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be1_port_3 } - - port: { get_resource: be1_port_4 } - - port: { get_resource: be1_port_5 } - - port: { get_resource: be1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be1_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be1_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] - - be1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] - - server_scp_be2: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be2_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be2 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be2_port_3 } - - port: { get_resource: be2_port_4 } - - port: { get_resource: be2_port_5 } - - port: { get_resource: be2_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be2_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be2_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be2_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be2_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] - - be2_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] - - server_scp_be3: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be3_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be3 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be3_port_3 } - - port: { get_resource: be3_port_4 } - - port: { get_resource: be3_port_5 } - - port: { get_resource: be3_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be3_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be3_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be3_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be3_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] - - be3_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] - - server_scp_be4: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be4_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be4 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be4_port_3 } - - port: { get_resource: be4_port_4 } - - port: { get_resource: be4_port_5 } - - port: { get_resource: be4_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be4_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be4_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be4_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be4_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] - - be4_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] - - server_scp_fe0: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe0_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe0 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe0_port_0 } - - port: { get_resource: fe0_port_2 } - - port: { get_resource: fe0_port_3 } - - port: { get_resource: fe0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe0_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe0_port_0: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_A1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] - - fe0_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] - - server_scp_fe1: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe1_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe1 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe1_port_1 } - - port: { get_resource: fe1_port_2 } - - port: { get_resource: fe1_port_3 } - - port: { get_resource: fe1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe1_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe1_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_B1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] - - fe1_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] - - server_smp0: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp0_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp0 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp0_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] - - server_smp1: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp1_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp1 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp1_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] - - server_db0: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db0_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db0 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db0_port_4 } - - port: { get_resource: db0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db0_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] - - server_db1: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db1_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db1 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db1_port_4 } - - port: { get_resource: db1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db1_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingType.yaml b/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingType.yaml deleted file mode 100644 index 29527495f7..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithParamsMissingType.yaml +++ /dev/null @@ -1,603 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: -# availability_zone_smp0: -# type: string -# default: nova -# availability_zone_smp1: -# type: string -# default: nova -# availability_zone_fe0: -# type: string -# default: nova -# availability_zone_fe1: -# type: string -# default: nova -# availability_zone_db0: -# type: string -# default: nova -# availability_zone_db1: -# type: string -# default: nova -# availability_zone_be0: -# type: string -# default: nova -# availability_zone_be1: -# type: string -# default: nova -# availability_zone_be2: -# type: string -# default: nova -# availability_zone_be3: -# type: string -# default: nova -# availability_zone_be4: -# type: string -# default: nova - - vnf_missing_desc: - description: Unique name for this VNF instance - default: This_is_the_SCP_name - label: be4 port 5 OAM ip address - -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be0_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be0_Cricket_OCS_protected_ips}}] - - be0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be0_OAM_direct_ips}}] - - server_scp_be1: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be1_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be1 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be1_port_3 } - - port: { get_resource: be1_port_4 } - - port: { get_resource: be1_port_5 } - - port: { get_resource: be1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be1_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be1_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] - - be1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] - - server_scp_be2: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be2_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be2 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be2_port_3 } - - port: { get_resource: be2_port_4 } - - port: { get_resource: be2_port_5 } - - port: { get_resource: be2_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be2_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be2_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be2_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be2_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] - - be2_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] - - server_scp_be3: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be3_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be3 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be3_port_3 } - - port: { get_resource: be3_port_4 } - - port: { get_resource: be3_port_5 } - - port: { get_resource: be3_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be3_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be3_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be3_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be3_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] - - be3_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] - - server_scp_be4: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be4_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be4 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be4_port_3 } - - port: { get_resource: be4_port_4 } - - port: { get_resource: be4_port_5 } - - port: { get_resource: be4_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be4_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be4_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be4_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be4_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] - - be4_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] - - server_scp_fe0: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe0_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe0 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe0_port_0 } - - port: { get_resource: fe0_port_2 } - - port: { get_resource: fe0_port_3 } - - port: { get_resource: fe0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe0_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe0_port_0: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_A1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] - - fe0_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] - - server_scp_fe1: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe1_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe1 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe1_port_1 } - - port: { get_resource: fe1_port_2 } - - port: { get_resource: fe1_port_3 } - - port: { get_resource: fe1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe1_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe1_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_B1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] - - fe1_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] - - server_smp0: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp0_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp0 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp0_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] - - server_smp1: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp1_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp1 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp1_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] - - server_db0: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db0_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db0 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db0_port_4 } - - port: { get_resource: db0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db0_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] - - server_db1: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db1_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db1 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db1_port_4 } - - port: { get_resource: db1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db1_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithValidParams.yaml b/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithValidParams.yaml deleted file mode 100644 index 6835485ca1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/heatArtifactParameters/heatWithValidParams.yaml +++ /dev/null @@ -1,787 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: -# availability_zone_smp0: -# type: string -# default: nova -# availability_zone_smp1: -# type: string -# default: nova -# availability_zone_fe0: -# type: string -# default: nova -# availability_zone_fe1: -# type: string -# default: nova -# availability_zone_db0: -# type: string -# default: nova -# availability_zone_db1: -# type: string -# default: nova -# availability_zone_be0: -# type: string -# default: nova -# availability_zone_be1: -# type: string -# default: nova -# availability_zone_be2: -# type: string -# default: nova -# availability_zone_be3: -# type: string -# default: nova -# availability_zone_be4: -# type: string -# default: nova - - vnf_name: - type: string - description: Unique name for this VNF instance - default: This_is_the_SCP_name - vnf_id: - type: string - description: Unique ID for this VNF instance - default: This_is_ths_SCP_id - - flavor_scp_be_id: - type: string - description: flavor type - default: a1.Small - flavor_scp_fe_id: - type: string - description: flavor type - default: a1.Small - flavor_smp_id: - type: string - description: flavor type - default: a1.Small - flavor_db_id: - type: string - description: flavor type - default: a1.Small - image_scp_be_id: - type: string - description: Image use to boot a server - default: asc_base_image_be - image_scp_fe_id: - type: string - description: Image use to boot a server - default: asc_base_image_fe - image_smp_id: - type: string - description: Image use to boot a server - default: asc_base_image_smp - image_db_id: - type: string - description: Image use to boot a server - default: asc_base_image_db - - int_vscp_fe_cluster_net_id: - type: string - description: LAN2 FE Cluster/KA - int_vscp_fe_cluster_cidr: - type: string - description: Private Network2 Address (CIDR notation) - int_vscp_cluster_net_id: - type: string - description: LAN3 Cluster - int_vscp_cluster_cidr: - type: string - description: Private Network3 Address (CIDR notation) - int_vscp_db_network_net_id: - type: string - description: LAN4 DB - int_vscp_db_network_cidr: - type: string - description: Private Network4 Address (CIDR notation) - SIGNET_vrf_A1_direct_net_id: - type: string - description: Network name for SIGTRAN_A - SIGNET_vrf_B1_direct_net_id: - type: string - description: Network name for SIGTRAN_B - Cricket_OCS_protected_net_id: - type: string - description: Network name for CRICKET_OCS - OAM_direct_net_id: - type: string - description: Network name for OAM - be0_Cricket_OCS_protected_ips: - type: string - label: be0 port 5 OAM ip address - description: be0 port 5 OAM ip address - be1_Cricket_OCS_protected_ips: - type: string - label: be1 port 5 OAM ip address - description: be1 port 5 OAM ip address - be2_Cricket_OCS_protected_ips: - type: string - label: be2 port 5 OAM ip address - description: be2 port 5 OAM ip address - be3_Cricket_OCS_protected_ips: - type: string - label: be3 port 5 OAM ip address - description: be3 port 5 OAM ip address - be4_Cricket_OCS_protected_ips: - type: string - label: be4 port 5 OAM ip address - description: be4 port 5 OAM ip address - be0_OAM_direct_ips: - type: string - label: be0 port 7 OAM ip address - description: be0 port 7 OAM ip address - be1_OAM_direct_ips: - type: string - label: be1 port 7 OAM ip address - description: be1 port 7 OAM ip address - be2_OAM_direct_ips: - type: string - label: be2 port 7 OAM ip address - description: be2 port 7 OAM ip address - be3_OAM_direct_ips: - type: string - label: be3 port 7 OAM ip address - description: be3 port 7 OAM ip address - be4_OAM_direct_ips: - type: string - label: be4 port 7 OAM ip address - description: be4 port 7 OAM ip address - fe0_SIGNET_vrf_A1_direct_ips: - type: string - label: fe0 port 0 SIGTRAN ip address - description: fe0 port 0 SIGTRAN ip address - fe0_OAM_direct_ips: - type: string - label: fe0 port 7 OAM ip address - description: fe0 port 7 OAM ip address - fe1_SIGNET_vrf_B1_direct_ips: - type: string - label: fe1 port 1 SIGTRAN ip address - description: fe1 port 1 SIGTRAN ip address - fe1_OAM_direct_ips: - type: string - label: fe1 port 7 OAM ip address - description: fe1 port 7 OAM ip address - smp0_OAM_direct_ips: - type: string - label: smp0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - smp1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: smp1 port 7 OAM ip address - db0_OAM_direct_ips: - type: string - label: db0 port 7 OAM ip address - description: smp0 port 7 OAM ip address - db1_OAM_direct_ips: - type: string - label: smp1 port 7 OAM ip address - description: db1 port 7 OAM ip address - vm_scp_be0_name: - type: string - default: vSCP_BE0 - description: name of VM - vm_scp_be1_name: - type: string - default: vSCP_BE1 - description: name of VM - vm_scp_be2_name: - type: string - default: vSCP_BE2 - description: name of VM - vm_scp_be3_name: - type: string - default: vSCP_BE3 - description: name of VM - vm_scp_be4_name: - type: string - default: vSCP_BE4 - description: name of VM - vm_scp_fe0_name: - type: string - default: vSCP_FE0 - description: name of VM - vm_scp_fe1_name: - type: string - default: vSCP_FE1 - description: name of VM - vm_smp0_name: - type: string - default: vSMP0 - description: name of VM - vm_smp1_name: - type: string - default: vSMP1 - description: name of VM - vm_db0_name: - type: string - default: vDB0 - description: name of VM - vm_db1_name: - type: string - default: vDB1 - description: name of VM - -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be0_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be0_Cricket_OCS_protected_ips}}] - - be0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be0_OAM_direct_ips}}] - - server_scp_be1: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be1_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be1 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be1_port_3 } - - port: { get_resource: be1_port_4 } - - port: { get_resource: be1_port_5 } - - port: { get_resource: be1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be1_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be1_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] - - be1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] - - server_scp_be2: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be2_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be2 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be2_port_3 } - - port: { get_resource: be2_port_4 } - - port: { get_resource: be2_port_5 } - - port: { get_resource: be2_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be2_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be2_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be2_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be2_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] - - be2_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] - - server_scp_be3: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be3_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be3 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be3_port_3 } - - port: { get_resource: be3_port_4 } - - port: { get_resource: be3_port_5 } - - port: { get_resource: be3_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be3_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be3_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be3_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be3_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] - - be3_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] - - server_scp_be4: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be4_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be4 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be4_port_3 } - - port: { get_resource: be4_port_4 } - - port: { get_resource: be4_port_5 } - - port: { get_resource: be4_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be4_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be4_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be4_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be4_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] - - be4_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] - - server_scp_fe0: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe0_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe0 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe0_port_0 } - - port: { get_resource: fe0_port_2 } - - port: { get_resource: fe0_port_3 } - - port: { get_resource: fe0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe0_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe0_port_0: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_A1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] - - fe0_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] - - server_scp_fe1: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe1_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe1 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe1_port_1 } - - port: { get_resource: fe1_port_2 } - - port: { get_resource: fe1_port_3 } - - port: { get_resource: fe1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe1_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe1_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_B1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] - - fe1_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] - - server_smp0: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp0_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp0 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp0_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] - - server_smp1: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp1_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp1 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp1_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] - - server_db0: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db0_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db0 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db0_port_4 } - - port: { get_resource: db0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db0_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] - - server_db1: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db1_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db1 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db1_port_4 } - - port: { get_resource: db1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db1_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/heatEnv/artifact_1.yaml b/test-apis-ci/src/test/resources/CI/tests/heatEnv/artifact_1.yaml deleted file mode 100644 index 7d4a85c2b6..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/heatEnv/artifact_1.yaml +++ /dev/null @@ -1,144 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: string - description: city name - default: Hulon - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 - private_building: - type: boolean - description: home_number - default: true -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/heatEnv/artifact_2.yaml b/test-apis-ci/src/test/resources/CI/tests/heatEnv/artifact_2.yaml deleted file mode 100644 index 2c404f0721..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/heatEnv/artifact_2.yaml +++ /dev/null @@ -1,469 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: -parameters: - city_name: - type: string - description: city name - default: Hulon - address: - type: string - description: address - default: Narkis - home_number: - type: number - description: home_number - default: 14 - private_building: - type: boolean - description: home_number - default: true -resources: - be0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be0_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be0_Cricket_OCS_protected_ips}}] - - be0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be0_OAM_direct_ips}}] - - server_scp_be1: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be1_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be1 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be1_port_3 } - - port: { get_resource: be1_port_4 } - - port: { get_resource: be1_port_5 } - - port: { get_resource: be1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be1_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be1_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] - - be1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] - - server_scp_be2: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be2_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be2 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be2_port_3 } - - port: { get_resource: be2_port_4 } - - port: { get_resource: be2_port_5 } - - port: { get_resource: be2_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be2_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be2_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be2_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be2_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] - - be2_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] - - server_scp_be3: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be3_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be3 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be3_port_3 } - - port: { get_resource: be3_port_4 } - - port: { get_resource: be3_port_5 } - - port: { get_resource: be3_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be3_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be3_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be3_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be3_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] - - be3_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] - - server_scp_be4: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be4_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be4 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be4_port_3 } - - port: { get_resource: be4_port_4 } - - port: { get_resource: be4_port_5 } - - port: { get_resource: be4_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be4_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } - - be4_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - be4_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - be4_port_5: - type: OS::Neutron::Port - properties: - network: { get_param: Cricket_OCS_protected_net_id } - fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] - - be4_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] - - server_scp_fe0: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe0_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe0 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe0_port_0 } - - port: { get_resource: fe0_port_2 } - - port: { get_resource: fe0_port_3 } - - port: { get_resource: fe0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe0_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe0_port_0: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_A1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] - - fe0_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe0_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] - - server_scp_fe1: - type: OS::Nova::Server -# depends on: scp_be_wait_condition - properties: - name: { get_param: vm_scp_fe1_name } - image: { get_param: image_scp_fe_id } -# availability_zone: { get_param: availability_zone_fe1 } - flavor: { get_param: flavor_scp_fe_id } - scheduler_hints: { group: { get_resource: FE_Affinity } } - networks: - - port: { get_resource: fe1_port_1 } - - port: { get_resource: fe1_port_2 } - - port: { get_resource: fe1_port_3 } - - port: { get_resource: fe1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_fe1_name} -# wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } - - fe1_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: SIGNET_vrf_B1_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] - - fe1_port_2: - type: OS::Neutron::Port - properties: - network_id: { get_resource: FE_Clustering_KA } - - fe1_port_3: - type: OS::Neutron::Port - properties: - network_id: { get_resource: Clustering_Network } - - fe1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] - - server_smp0: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp0_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp0 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp0_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] - - server_smp1: - type: OS::Nova::Server - properties: - name: { get_param: vm_smp1_name } - image: { get_param: image_smp_id } -# availability_zone: { get_param: availability_zone_smp1 } - flavor: { get_param: flavor_smp_id } - scheduler_hints: { group: { get_resource: SMP_Affinity } } - networks: - - port: { get_resource: smp1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_smp1_name} -# wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } - - smp1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] - - server_db0: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db0_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db0 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db0_port_4 } - - port: { get_resource: db0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db0_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db0_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db0_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] - - server_db1: - type: OS::Nova::Server -# depends_on: smp_wait_condition - properties: - name: { get_param: vm_db1_name } - image: { get_param: image_db_id } -# availability_zone: { get_param: availability_zone_db1 } - flavor: { get_param: flavor_db_id } - scheduler_hints: { group: { get_resource: DB_Affinity } } - networks: - - port: { get_resource: db1_port_4 } - - port: { get_resource: db1_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_db1_name} -# wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } - - db1_port_4: - type: OS::Neutron::Port - properties: - network_id: { get_resource: DB_Network } - - db1_port_7: - type: OS::Neutron::Port - properties: - network: { get_param: OAM_direct_net_id } - fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/heatEnv/yuli.yaml b/test-apis-ci/src/test/resources/CI/tests/heatEnv/yuli.yaml deleted file mode 100644 index 7d4a85c2b6..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/heatEnv/yuli.yaml +++ /dev/null @@ -1,144 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: string - description: city name - default: Hulon - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 - private_building: - type: boolean - description: home_number - default: true -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/BindingAsset.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/BindingAsset.yml deleted file mode 100644 index 5117247373..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/BindingAsset.yml +++ /dev/null @@ -1,14 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 - -node_types: - org.openecomp.resource.cp: - derived_from: tosca.nodes.Root - properties: - type: - type: string - required: false - requirements: - - VirtualBinding: - capability: tosca.capabilities.network.Bindable - relationship: tosca.relationships.network.BindsTo - occurrences: [0, UNBOUNDED] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPHasNoReqCap.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPHasNoReqCap.yml deleted file mode 100644 index 8309df24b5..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPHasNoReqCap.yml +++ /dev/null @@ -1,9 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 - -node_types: - org.openecomp.resource.cp.CP: - derived_from: tosca.nodes.Compute - properties: - type: - type: string - required: false \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPHasNoReqCap_DerivedFromMyCompute1.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPHasNoReqCap_DerivedFromMyCompute1.yml deleted file mode 100644 index 478e742bc5..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPHasNoReqCap_DerivedFromMyCompute1.yml +++ /dev/null @@ -1,9 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 - -node_types: - org.openecomp.resource.cp.CP: - derived_from: org.openecomp.resource.MyCompute1 - properties: - type: - type: string - required: false \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPWithAttributes.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPWithAttributes.yml deleted file mode 100644 index 807f7fe630..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CPWithAttributes.yml +++ /dev/null @@ -1,56 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 - -node_types: - org.openecomp.resource.cp.CP: derived_from: tosca.nodes.Root - properties: - type: - type: string - required: false - ip_address: - type: string - required: false - description: Allow the user to set a static IP. - order: - type: integer - required: false - default: 0 - description: The order of the NIC on the compute instance (e.g. eth2). - is_default: - type: boolean - required: false - default: false - description: “If is_default=true this port will be used for the default gateway route. Only one port that is associated to single compute node can set as is_default=true.” - ip_range_start: - type: string - required: false - description: “Defines the starting IP of a range to be allocated for the VFC instances that are associated with this Port.” - ip_range_end: - type: string - required: false - description: “Defines the ending IP of a range to be allocated for the compute instances that are associated with this Port.” - is_tagged: - type: boolean - required: false - default: false - description: - attributes: - private_address: - type: string - default: "Hello" - value: "HelloWord" - public_address: - default: "DefaultValuePublicAddress" - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - virtualLink: - capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo - - virtualbinding: - capability: tosca.capabilities.network.Bindable relationship: tosca.relationships.network.BindsTo \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveCapTest_1.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveCapTest_1.yml deleted file mode 100644 index b9e6c4f9b5..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveCapTest_1.yml +++ /dev/null @@ -1,34 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute1: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - capaBility: - type: tosca.capabilities.OperatingSystem diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveCapTest_2.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveCapTest_2.yml deleted file mode 100644 index 230e4fa924..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveCapTest_2.yml +++ /dev/null @@ -1,34 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute2: - derived_from: org.openecomp.resource.MyCompute1 - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - Capability: - type: tosca.capabilities.OperatingSystem diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveReqTest_1.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveReqTest_1.yml deleted file mode 100644 index 0d097a8f20..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveReqTest_1.yml +++ /dev/null @@ -1,34 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute1: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - requirEment: - capability: tosca.capabilities.Endpoint - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveReqTest_2.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveReqTest_2.yml deleted file mode 100644 index 9cc1f2737b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/CaseInsensitiveReqTest_2.yml +++ /dev/null @@ -1,34 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute2: - derived_from: org.openecomp.resource.MyCompute1 - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - Requirement: - capability: tosca.capabilities.Endpoint - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DerivedFromCPWithOwnReq.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DerivedFromCPWithOwnReq.yml deleted file mode 100644 index 3514acfe9f..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DerivedFromCPWithOwnReq.yml +++ /dev/null @@ -1,14 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 - -node_types: - org.openecomp.resource.cp.LAN: - derived_from: org.openecomp.resource.cp.CP - properties: - type: - type: string - required: false - requirements: - - virtualLink: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: [0, UNBOUNDED] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DerivedFromWebApplication_HasNoReqType.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DerivedFromWebApplication_HasNoReqType.yml deleted file mode 100644 index 7fbf4ec132..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DerivedFromWebApplication_HasNoReqType.yml +++ /dev/null @@ -1,27 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyChildWebApplication: - derived_from: tosca.nodes.WebApplication - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - diff: - capability: - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - deff: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentCapFromRoot.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentCapFromRoot.yml deleted file mode 100644 index fe79bb3af9..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentCapFromRoot.yml +++ /dev/null @@ -1,26 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyAsset: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - test: - capability: tosca.capabilities.Scalable - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqAndCap.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqAndCap.yml deleted file mode 100644 index 798cd5b9cd..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqAndCap.yml +++ /dev/null @@ -1,34 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute1: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - DependencY: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - FeaTurE: - type: tosca.capabilities.OperatingSystem \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqCapFromCompute1.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqCapFromCompute1.yml deleted file mode 100644 index c72d0ee62a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqCapFromCompute1.yml +++ /dev/null @@ -1,22 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute2: - derived_from: org.openecomp.resource.MyCompute1 - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - diff: - capability: tosca.capabilities.Container - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqCapFromCompute2.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqCapFromCompute2.yml deleted file mode 100644 index 7132ca493a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqCapFromCompute2.yml +++ /dev/null @@ -1,25 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute3: - derived_from: org.openecomp.resource.MyCompute1 - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - diff: - capability: tosca.capabilities.Container - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - deff: - type: tosca.capabilities.Container diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqFromCompute.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqFromCompute.yml deleted file mode 100644 index e9438bae3c..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/DifferentReqFromCompute.yml +++ /dev/null @@ -1,32 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute1: - derived_from: tosca.nodes.Compute - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - test: - capability: tosca.capabilities.Scalable - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/FatherHasNoReqCap.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/FatherHasNoReqCap.yml deleted file mode 100644 index 039ab61939..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/FatherHasNoReqCap.yml +++ /dev/null @@ -1,9 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 - -node_types: - org.openecomp.resource.cp.CP: - derived_from: tosca.nodes.Root - properties: - type: - type: string - required: false \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure01.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure01.yml deleted file mode 100644 index f20a9eb48f..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure01.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_boolean: - type: list - description : another description - default: - - false - - true - entry_schema: - description: This is my property - type: booolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure02.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure02.yml deleted file mode 100644 index f1af89ca6a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure02.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - false - - truee - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure03.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure03.yml deleted file mode 100644 index 974d96ba5b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure03.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - false - - 3 - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure04.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure04.yml deleted file mode 100644 index 52377e4b02..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure04.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - false - - 3.56 - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure05.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure05.yml deleted file mode 100644 index c66b4347f6..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure05.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - 10000 - - 3.56 - entry_schema: - description: This is my property - type: integer - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure06.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure06.yml deleted file mode 100644 index 79b3c03cdf..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure06.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - 10000 - - aaaa - entry_schema: - description: This is my property - type: integer - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure07.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure07.yml deleted file mode 100644 index 5556e9ddfb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure07.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - 10000 - - true - entry_schema: - description: This is my property - type: integer - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure08.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure08.yml deleted file mode 100644 index a3b21a64a3..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure08.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - 10.50 - - true - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure09.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure09.yml deleted file mode 100644 index dc28591499..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure09.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - 10.50 - - asdc - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure10.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure10.yml deleted file mode 100644 index e465448064..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure10.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - 10.50 - - 500 - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure11.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure11.yml deleted file mode 100644 index a428b51974..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure11.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - 10.50 - - 500.0@ - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure12.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure12.yml deleted file mode 100644 index d840253120..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure12.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - 10000 - - 3# - entry_schema: - description: This is my property - type: integer - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure13.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure13.yml deleted file mode 100644 index 4eb59886e4..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure13.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - false - - true% - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure14.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure14.yml deleted file mode 100644 index ad263f3d00..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure14.yml +++ /dev/null @@ -1,18 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - false - - falsee - - true - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure15.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure15.yml deleted file mode 100644 index 93e8caa0a3..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure15.yml +++ /dev/null @@ -1,19 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: list - description : another description - default: - - 10.5 - - 10.6x - - 20.5 - - 30.5 - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure16.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure16.yml deleted file mode 100644 index ed8ea4d70c..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/ListPropertyFalure16.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_boolean: - type: koko - description : another description - default: - - false - - true - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure01.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure01.yml deleted file mode 100644 index c7ff0743f2..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure01.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_boolean: - type: map - description : another description - default: - - false - - true - entry_schema: - description: This is my property - type: booolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure02.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure02.yml deleted file mode 100644 index d9abb87db8..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure02.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - false - - truee - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure03.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure03.yml deleted file mode 100644 index e8f9b6eaa9..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure03.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - false - - 3 - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure04.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure04.yml deleted file mode 100644 index d9dc4f955b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure04.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - false - - 3.56 - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure05.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure05.yml deleted file mode 100644 index aba6ff1992..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure05.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - 10000 - - 3.56 - entry_schema: - description: This is my property - type: integer - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure06.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure06.yml deleted file mode 100644 index f27904d6e6..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure06.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - 10000 - - aaaa - entry_schema: - description: This is my property - type: integer - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure07.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure07.yml deleted file mode 100644 index ea123f3b1b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure07.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - 10000 - - true - entry_schema: - description: This is my property - type: integer - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure08.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure08.yml deleted file mode 100644 index 87b51fb2de..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure08.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - 10.50 - - true - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure09.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure09.yml deleted file mode 100644 index 2fc8ded544..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure09.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - 10.50 - - asdc - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure10.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure10.yml deleted file mode 100644 index 3ab449d72e..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure10.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - 10.50 - - 500 - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure11.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure11.yml deleted file mode 100644 index e437de822e..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure11.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - 10.50 - - 500.0@ - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure12.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure12.yml deleted file mode 100644 index f2fbc7c435..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure12.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - 10000 - - 3# - entry_schema: - description: This is my property - type: integer - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure13.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure13.yml deleted file mode 100644 index e375aae197..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure13.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - false - - true% - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure14.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure14.yml deleted file mode 100644 index e087212f1b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure14.yml +++ /dev/null @@ -1,18 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - false - - falsee - - true - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure15.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure15.yml deleted file mode 100644 index 3923ee18d7..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure15.yml +++ /dev/null @@ -1,19 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_property: - type: map - description : another description - default: - - 10.5 - - 10.6x - - 20.5 - - 30.5 - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure16.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure16.yml deleted file mode 100644 index ed8ea4d70c..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MapPropertyFalure16.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_boolean: - type: koko - description : another description - default: - - false - - true - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MyFatherCompute_NoReqCap.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MyFatherCompute_NoReqCap.yml deleted file mode 100644 index dfc564b458..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/MyFatherCompute_NoReqCap.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyFatherCompute: - derived_from: tosca.nodes.Compute - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameCapAsCompute.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameCapAsCompute.yml deleted file mode 100644 index 533333ee09..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameCapAsCompute.yml +++ /dev/null @@ -1,26 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute1: - derived_from: tosca.nodes.Compute - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - capabilities: - host: - type: tosca.capabilities.Container - endpoint : - type: tosca.capabilities.Endpoint.Admin - OS: - type: tosca.capabilities.OperatingSystem - BINDING: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameReqAsCompute.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameReqAsCompute.yml deleted file mode 100644 index 9d8b2d8375..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameReqAsCompute.yml +++ /dev/null @@ -1,23 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute1: - derived_from: tosca.nodes.Compute - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - LOCAL_STORAGE: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, 1] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameReqAsCompute_DerivedFromMyCompute1.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameReqAsCompute_DerivedFromMyCompute1.yml deleted file mode 100644 index a5413e516f..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/SameReqAsCompute_DerivedFromMyCompute1.yml +++ /dev/null @@ -1,23 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute2: - derived_from: org.openecomp.resource.MyCompute1 - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - LOCAL_STORAGE: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, 2] \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/computeCap11.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/computeCap11.yml deleted file mode 100644 index 9cea0b9dc8..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/computeCap11.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vfc.vfc3: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [1, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - occurrences: [1, 1] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/computeCap1UNBOUNDED.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/computeCap1UNBOUNDED.yml deleted file mode 100644 index 24efc27711..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/computeCap1UNBOUNDED.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vfc.vfc2: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [1, 1] - capabilities: - host: - type: tosca.capabilities.Container - occurrences: [1, UNBOUNDED] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/derivedFromMyCompute.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/derivedFromMyCompute.yml deleted file mode 100644 index 237bec1f0c..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/derivedFromMyCompute.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.DerivedFromMyCompute: - derived_from: org.openecomp.resource.MyCompute - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/derivedFromWebAppDerivedReqCap.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/derivedFromWebAppDerivedReqCap.yml deleted file mode 100644 index 0679bff4b1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/derivedFromWebAppDerivedReqCap.yml +++ /dev/null @@ -1,15 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyWebApp: - derived_from: tosca.nodes.WebApplication - properties: - context_root: - type: string - capabilities: - app_endpoint: - type: tosca.capabilities.Endpoint.Admin #derived from WebApplication's tosca.capabilities.Endpoint "app_endpoint" - requirements: - - host: - capability: tosca.capabilities.Container.Docker #derived from WebApplication's tosca.capabilities.Container "host" - node: tosca.nodes.WebServer - relationship: tosca.relationships.HostedOn diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importAttributeSuccessFlow.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importAttributeSuccessFlow.yml deleted file mode 100644 index 0fa9a302f2..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importAttributeSuccessFlow.yml +++ /dev/null @@ -1,53 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyComputeTest: - derived_from: tosca.nodes.Root - properties: - myProp: - type: tosca.datatypes.Credential - descritpion: hey Desc - default: - "protocol" : hey1 - "token_type" : hey2 - "token" : hey3 - "keys" : {"keyA" : "val1" , keyB : val2} - "user" : hey4 - attributes: - private_address: - type: string - status: supported - default: myDefault - public_address: - type: string - networks: - type: map - default: {keyA : val1 , keyB : val2} - entry_schema: - type: string - ports: - type: tosca.datatypes.Credential - description: this is my description - default: - "protocol" : hey1 - "token_type" : hey2 - "token" : hey3 - "keys" : {"keyA" : "val1" , keyB : val2} - "user" : hey4 - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importCapabilityNameExistsOnParent.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importCapabilityNameExistsOnParent.yml deleted file mode 100644 index 4d6db6c8c0..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importCapabilityNameExistsOnParent.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute1: - derived_from: tosca.nodes.Compute - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - Binding: #"binding" exists on parent - type: tosca.capabilities.OperatingSystem diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importDuplicateCapability.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importDuplicateCapability.yml deleted file mode 100644 index fcc3952f94..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importDuplicateCapability.yml +++ /dev/null @@ -1,42 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - - LOCAL_Storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - Scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importDuplicateRequirements.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importDuplicateRequirements.yml deleted file mode 100644 index 7cab3ac590..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importDuplicateRequirements.yml +++ /dev/null @@ -1,40 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - - LOCAL_Storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertyBadDefault.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertyBadDefault.yml deleted file mode 100644 index a3ff088a35..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertyBadDefault.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.TestResource: - derived_from: tosca.nodes.Root - properties: - my_prop: - type: list - description : another description - default: - - 12 - - true - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertyGoodDefault.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertyGoodDefault.yml deleted file mode 100644 index 2f864a727e..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertyGoodDefault.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_prop: - type: list - description : another description - default: - - false - - true - entry_schema: - description: This is my property - type: string - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertySuccessFlow.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertySuccessFlow.yml deleted file mode 100644 index fd52df5f9b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importListPropertySuccessFlow.yml +++ /dev/null @@ -1,198 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - my_boolean: - type: list - description : another description - default: - - false - - true - entry_schema: - description: This is my property - type: boolean - my_boolean_array: - type: list - description : another description - default: [ true , false ] - entry_schema: - description: This is my property - type: boolean - duplicate_boolean_values: - type: list - description : another description - default: [ true , false , true ] - entry_schema: - description: This is my property - type: boolean - boolean_null_value: - type: list - description : another description - default: - - true - - - - false - entry_schema: - description: This is my property - type: boolean - my_integers: - type: list - description : another description - default: - - 0 - - 1000 - - -1000 - - 50 - entry_schema: - description: This is my property - type: integer - my_integers_array: - type: list - description : another description - default: [ 10 , -1000, 0 ] - entry_schema: - description: This is my property - type: integer - duplicate_integers_values: - type: list - description : another description - default: [ 10 , 10, -1000, 0 ] - entry_schema: - description: This is my property - type: integer - integer_null_value: - type: list - description : another description - default: - - 1000 - - - - 2000 - entry_schema: - description: This is my property - type: integer - my_string: - type: list - description : another description - default: - - asdc - - $?^@ecomp$!#%()_-~@+*^...;;/w# - - uc - entry_schema: - description: This is my property - type: string - my_string_array: - type: list - description : another description - default: [ AAA, ~$~#bbb%^*_-, qwe , 1.3 , 500 , true ] - entry_schema: - description: This is my property - type: string - string_null_value: - type: list - description : another description - default: - - asdc - - - - uc - entry_schema: - description: This is my property - type: string - string_space_value: - type: list - description : another description - default: - - asdc - - - - uc - entry_schema: - description: This is my property - type: string - duplicate_string_values: - type: list - description : another description - default: - - asdc - - asdc - - uc - entry_schema: - description: This is my property - type: string - my_float: - type: list - description : another description - default: - - 6 - - 1000.000001 - - -3.0f - entry_schema: - description: This is my property - type: float - my_float_array: - type: list - description : another description - default: [ 0.01 , -5.0 , 2.1f ] - entry_schema: - description: This is my property - type: float - duplicate_float_values: - type: list - description : another description - default: - - 0.0 - - 0.0 - - 4.555555 - entry_schema: - description: This is my property - type: float - float_no_default_values: - type: list - description : another description - default: - entry_schema: - description: This is my property - type: float - float_null_value: - type: list - description : another description - default: - - 6 - - - - -3.0f - entry_schema: - description: This is my property - type: float - float_space_value: - type: list - description : another description - default: - - 6 - - - - -3.0f - entry_schema: - description: This is my property - type: float - integer_no_default_values: - type: list - description : another description - default: - entry_schema: - description: This is my property - type: integer - string_no_default_values: - type: list - description : another description - default: - entry_schema: - description: This is my property - type: string - boolean_no_default_values: - type: list - description : another description - default: - entry_schema: - description: This is my property - type: boolean - capabilities: - link: - type: tosca.capabilities.network.Linkable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importMapPropertySuccessFlow.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importMapPropertySuccessFlow.yml deleted file mode 100644 index f856603397..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importMapPropertySuccessFlow.yml +++ /dev/null @@ -1,452 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.LinkTest: - derived_from: tosca.nodes.Root - properties: - string_prop01: - type: map - description : another description - default: {keyA : val1 , keyB : val2} - entry_schema: - description: This is my property - type: string - string_prop02: - type: map - description : another description - default: {keyA : "val1" , keyB : "val2"} - entry_schema: - description: This is my property - type: string - string_prop03: - type: map - description : another description - default: {"keyA" : "val1" , keyB : val2} - entry_schema: - description: This is my property - type: string - string_prop04: - type: map - description : another description - default: {"keyA" : 10 , keyB : true } - entry_schema: - description: This is my property - type: string - string_prop05: - type: map - description : another description - default: {"keyA" : , keyB : "Big" } - entry_schema: - description: This is my property - type: string - string_prop06: - type: map - description : another description - default: {"keyA" : aaaA , keyB : null } - entry_schema: - description: This is my property - type: string - string_prop07: - type: map - description : another description - default: {"keyA" : NULL , keyB : Null } - entry_schema: - description: This is my property - type: string - string_prop08: - type: map - description : another description - default: {"keyA" : "" , keyB : "abcd" } - entry_schema: - description: This is my property - type: string - string_prop09: - type: map - description : another description - default: {"keyA" : " " , keyB : "abcd" } - entry_schema: - description: This is my property - type: string - string_prop10: - type: map - description : another description - default: {"keyA" : " aaaa" , keyB : " bbbb" } - entry_schema: - description: This is my property - type: string - string_prop11: - type: map - description : another description - default: {"keyA" : "aaaa " , keyB : "bbbb " } - entry_schema: - description: This is my property - type: string - string_prop12: - type: map - description : another description - default: {"keyA" : " aaaa " , keyB : " bbbb ccccc " } - entry_schema: - description: This is my property - type: string - string_prop13: - type: map - description : another description - default: - keyA : "aaaa" - entry_schema: - description: This is my property - type: string - string_prop14: - type: map - description : another description - default: - keyA : " aaaa " - entry_schema: - description: This is my property - type: string - string_prop15: - type: map - description : another description - default: - keyA : AbcD - entry_schema: - description: This is my property - type: string - string_prop16: - type: map - description : another description - default: - keyA : AbcD - entry_schema: - description: This is my property - type: string - string_prop17: - type: map - description : another description - default: - keyA : AbcD - entry_schema: - description: This is my property - type: string - string_prop18: - type: map - description : another description - default: - keyA : AbcD - entry_schema: - description: This is my property - type: string - string_prop19: - type: map - description : another description - default: - keyA : AbcD - entry_schema: - description: This is my property - type: string - string_prop20: - type: map - description : another description - default: - keyA : aaaa - keya : aaaa - Keya : Aaaa - KEYA : nnnn - entry_schema: - description: This is my property - type: string - string_prop21: - type: map - description : another description - default: - keyA : NULL - keyB : null - keyC : Null - entry_schema: - description: This is my property - type: string - string_prop22: - type: map - description : another description - default: - entry_schema: - description: This is my property - type: string - integer_prop01: - type: map - description : another description - default: {keyA : 1 , keyB : 1000} - entry_schema: - description: This is my property - type: integer - integer_prop02: - type: map - description : another description - default: {keyA : Null , keyB : NULL ,keyC : null } - entry_schema: - description: This is my property - type: integer - integer_prop03: - type: map - description : another description - default: {keyA : , keyB : -600} - entry_schema: - description: This is my property - type: integer - integer_prop03: - type: map - description : another description - default: {keyA : 800 , keyB : -600} - entry_schema: - description: This is my property - type: integer - integer_prop04: - type: map - description : another description - default: {keyA : , keyB : -600} - entry_schema: - description: This is my property - type: integer - integer_prop05: - type: map - description : another description - default: {keyA : 100 , keyB : 0 } - entry_schema: - description: This is my property - type: integer - integer_prop06: - type: map - description : another description - default: {keyA : 100 , keyB : 00} - entry_schema: - description: This is my property - type: integer - integer_prop07: - type: map - description : another description - default: {keyA : 100 , keyB : 100 } - entry_schema: - description: This is my property - type: integer - integer_prop08: - type: map - description : another description - default: - keyA : 100 - keyB : 200 - entry_schema: - description: This is my property - type: integer - integer_prop09: - type: map - description : another description - default: - keyA : 100 - keyB : 200 - entry_schema: - description: This is my property - type: integer - integer_prop10: - type: map - description : another description - default: - keyA : null - keyA : Null - keyB : 1111 - keyB : 2222 - entry_schema: - description: This is my property - type: integer - integer_prop11: - type: map - description : another description - default: - keyA : null - keyB : Null - keyC : NULL - keyD : - entry_schema: - description: This is my property - type: integer - integer_prop12: - type: map - description : another description - default: - entry_schema: - description: This is my property - type: integer - integer_prop13: - type: map - description : another description - default: {keyA : 100 , keyA : 200} - entry_schema: - description: This is my property - type: integer - boolean_prop01: - type: map - description : another description - default: {keyA : true , keyB : false , keyC : false } - entry_schema: - description: This is my property - type: boolean - boolean_prop02: - type: map - description : another description - default: {keyA : TRUE , keyB : FALSE , keyC : False } - entry_schema: - description: This is my property - type: boolean - boolean_prop03: - type: map - description : another description - default: - keyA : null - keyB : Null - keyC : NULL - keyD : - entry_schema: - description: This is my property - type: boolean - boolean_prop04: - type: map - description : another description - default: {keyA : Null , keyB : NULL ,keyC : null ,keyD : } - entry_schema: - description: This is my property - type: boolean - boolean_prop05: - type: map - description : another description - default: {keyA : true , keyB : false , keyC : false } - entry_schema: - description: This is my property - type: boolean - boolean_prop06: - type: map - description : another description - default: - keyA : true - keyB : true - keyC : false - entry_schema: - description: This is my property - type: boolean - boolean_prop07: - type: map - description : another description - default: - entry_schema: - description: This is my property - type: boolean - boolean_prop08: - type: map - description : another description - default: - keyA : false - keyA : true - keyB : true - keyB : false - entry_schema: - description: This is my property - type: boolean - boolean_prop09: - type: map - description : another description - default: {keyA : true,keyA : false,keyB : false,keyB : true} - entry_schema: - description: This is my property - type: boolean - float_prop01: - type: map - description : another description - default: {keyA : 1.20 , keyB : 3.56f , keyC : 33} - entry_schema: - description: This is my property - type: float - float_prop02: - type: map - description : another description - default: {keyA : 0.00, keyB : 0.0 , keyC : 0 } - entry_schema: - description: This is my property - type: float - float_prop03: - type: map - description : another description - default: {keyA : null, keyB : Null , keyC : NULL , keyD : } - entry_schema: - description: This is my property - type: float - float_prop04: - type: map - description : another description - default: {keyA : 1.20 , keyB : 3.56f , keyC : 33 } - entry_schema: - description: This is my property - type: float - float_prop05: - type: map - description : another description - default: - keyA : 33 - keyB : 1.2000 - keyC : 3.607f - keyD : 0 - entry_schema: - description: This is my property - type: float - float_prop06: - type: map - description : another description - default: - keyA : 33 - keyB : 1.2000 - keyC : 3.607f - entry_schema: - description: This is my property - type: float - float_prop07: - type: map - description : another description - default: - keyA : null - keyB : Null - keyC : NULL - keyD : - entry_schema: - description: This is my property - type: float - float_prop08: - type: map - description : another description - default: - entry_schema: - description: This is my property - type: float - float_prop09: - type: map - description : another description - default: - keyA : 3.5 - keyA : 0.01 - keyB : 3.6 - keyB : - entry_schema: - description: This is my property - type: float - float_prop10: - type: map - description : another description - default: {keyA : 0.0002} - entry_schema: - description: This is my property - type: float - float_prop11: - type: map - description : another description - default: {keyA : 0.000 , keyA : 003.56f, keyB : 33} - entry_schema: - description: This is my property - type: float - capabilities: - link: - type: tosca.capabilities.network.Linkable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importRequirementNameExistsOnParent.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importRequirementNameExistsOnParent.yml deleted file mode 100644 index e4d626fca6..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importRequirementNameExistsOnParent.yml +++ /dev/null @@ -1,34 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute1: - derived_from: tosca.nodes.Compute - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - Local_Storage: - capability: tosca.capabilities.Endpoint - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importRequirementNameExistsOnParent_DerivedFromMyCompute1.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importRequirementNameExistsOnParent_DerivedFromMyCompute1.yml deleted file mode 100644 index 7ae9552d6a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/importRequirementNameExistsOnParent_DerivedFromMyCompute1.yml +++ /dev/null @@ -1,34 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute2: - derived_from: org.openecomp.resource.MyCompute1 - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - Local_Storage: - capability: tosca.capabilities.Endpoint - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/missingCapInCapDefinition.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/missingCapInCapDefinition.yml deleted file mode 100644 index 301116c985..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/missingCapInCapDefinition.yml +++ /dev/null @@ -1,37 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -description: Template for vSCP -- connectable to OCS-FW -- temporary model for 1602 demo - -############################ -# The model capture four sub-components (VDUs) and their connectivity to six -# networks. -############################ - -node_types: - -#The node type for vSCP -#used for substitution mapping, or to describe vSCP resource in ASDC studio - org.openecomp.resource.vSCP-03-16: - derived_from: tosca.nodes.Root - requirements: - - sigtran_connection1: - capability: tosca.capabilities.Node - - sigtran_connection2: - capability: tosca.capabilities.Node - - ocs_connection: - capability: tosca.capabilities.Node - - oam_connection: - capability: tosca.capabilities.Node - - firewall: - capability: tosca.capabilities.Node - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: org.openecomp.capabilities.networkInterfaceNotFound \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/missingCapInReqDefinition.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/missingCapInReqDefinition.yml deleted file mode 100644 index d100dafdf9..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/missingCapInReqDefinition.yml +++ /dev/null @@ -1,25 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -description: Template for vSCP -- connectable to OCS-FW -- temporary model for 1602 demo - -############################ -# The model capture four sub-components (VDUs) and their connectivity to six -# networks. -############################ - -node_types: - -#The node type for vSCP -#used for substitution mapping, or to describe vSCP resource in ASDC studio - org.openecomp.resource.vSCP-03-16: - derived_from: tosca.nodes.Root - requirements: - - sigtran_connection1: - capability: org.openecomp.capabilities.networkInterfaceNotFound - - sigtran_connection2: - capability: tosca.capabilities.Node - - ocs_connection: - capability: tosca.capabilities.Node - - oam_connection: - capability: tosca.capabilities.Node - - firewall: - capability: tosca.capabilities.Node \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myChildCompute_NoReqCap.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myChildCompute_NoReqCap.yml deleted file mode 100644 index cc5b202bc7..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myChildCompute_NoReqCap.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyChildCompute: - derived_from: org.openecomp.resource.MyFatherCompute - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myChildWebApp_DerivedFromContainer.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myChildWebApp_DerivedFromContainer.yml deleted file mode 100644 index b7859d4c14..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myChildWebApp_DerivedFromContainer.yml +++ /dev/null @@ -1,15 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyChildWebApp: - derived_from: org.openecomp.resource.MyWebApp - properties: - context_root: - type: string - capabilities: - app_endpoint: - type: tosca.capabilities.Endpoint - requirements: - - host: - capability: tosca.capabilities.Container - node: tosca.nodes.WebServer - relationship: tosca.relationships.HostedOn \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myCompute.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myCompute.yml deleted file mode 100644 index 98bf9b7902..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myCompute.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeDerivedFromNotExists.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeDerivedFromNotExists.yml deleted file mode 100644 index 2b2807395a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeDerivedFromNotExists.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.RootNotExists - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeIncorrectDefenitionVersionValue.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeIncorrectDefenitionVersionValue.yml deleted file mode 100644 index 2fa3ad0c08..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeIncorrectDefenitionVersionValue.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: toscaSimpleYaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeIncorrectNameSpaceFormat.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeIncorrectNameSpaceFormat.yml deleted file mode 100644 index d1a613fff2..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeIncorrectNameSpaceFormat.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource2.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeNoDefenitionVersion.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeNoDefenitionVersion.yml deleted file mode 100644 index 8084d049db..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeNoDefenitionVersion.yml +++ /dev/null @@ -1,34 +0,0 @@ -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeOccurencySuccess.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeOccurencySuccess.yml deleted file mode 100644 index 40ae610c06..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeOccurencySuccess.yml +++ /dev/null @@ -1,77 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [1, UNBOUNDED] - - local_storage200: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [1, 1] - - local_storage300: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [1, 10] - - local_storage400: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [1, 10000000] - - local_storage500: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [2, 3] - - local_storageNoOccurrences600: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpointNoOccurrence : - type: tosca.capabilities.Endpoint.Admin - endpoint200 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [1, 2] - endpoint300 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [1, 1] - endpoint400 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [1, 10] - endpoint500 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [1, 10000000] - endpoint600 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [1, UNBOUNDED ] - endpoint700 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [2, 4 ] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeParssingFalure.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeParssingFalure.yml deleted file mode 100644 index b243add14a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeParssingFalure.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requiremens: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilitis: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeReqNameExistsOnDerived.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeReqNameExistsOnDerived.yml deleted file mode 100644 index 43d92d1681..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeReqNameExistsOnDerived.yml +++ /dev/null @@ -1,34 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute1: - derived_from: tosca.nodes.Compute - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - Local_Storage: #"local_storage" exists on parent - capability: tosca.capabilities.Endpoint - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeVF.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeVF.yml deleted file mode 100644 index 90e771dab1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeVF.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.VF.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeWithNodeTypesTwice.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeWithNodeTypesTwice.yml deleted file mode 100644 index 73b201eab4..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeWithNodeTypesTwice.yml +++ /dev/null @@ -1,42 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable - - org.openecomp.resource.example.TransactionSubsystem: - derived_from: tosca.nodes.Root - capabilities: - message_receiver: tosca.capabilities.Endpoint - requirements: - - database_endpoint: tosca.capabilities.Endpoint.Database \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeWithTopologyTemplate.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeWithTopologyTemplate.yml deleted file mode 100644 index c451eb2514..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myComputeWithTopologyTemplate.yml +++ /dev/null @@ -1,44 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -topology_template: - description: Template of an application connecting to a database. - - node_templates: - web_app: - type: tosca.nodes.WebApplication.MyWebApp - requirements: - - host: web_server - - database_endpoint: db -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myFatherWebApp_derviedFromDocker.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myFatherWebApp_derviedFromDocker.yml deleted file mode 100644 index 43a9a174f8..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myFatherWebApp_derviedFromDocker.yml +++ /dev/null @@ -1,16 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyWebApp: - derived_from: tosca.nodes.WebApplication - properties: - context_root: - type: string - capabilities: - app_endpoint: - type: tosca.capabilities.Endpoint - requirements: - - HOSt: - capability: tosca.capabilities.Container.Docker - node: tosca.nodes.WebServer - relationship: tosca.relationships.HostedOn - occurrences: [ 1, 2 ] diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myLinkVL.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myLinkVL.yml deleted file mode 100644 index 7c796d2801..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myLinkVL.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vl.MyLink: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myPortCP.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myPortCP.yml deleted file mode 100644 index ff255f2394..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/myPortCP.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.cp.MyPort: - derived_from: org.openecomp.resource.cp.Port - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage: - capability: tosca.capabilities.network.Bindable - node: org.openecomp.resource.vl.MyLink - relationship: tosca.relationships.BindTo - occurrences: [0, UNBOUNDED] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/noContent.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/noContent.yml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure01.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure01.yml deleted file mode 100644 index f007a0fed2..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure01.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [2, 0] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure02.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure02.yml deleted file mode 100644 index 0487b63cb3..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure02.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [-1, 2] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure03.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure03.yml deleted file mode 100644 index 7afdffa59d..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure03.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [1, -2] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure04.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure04.yml deleted file mode 100644 index f8a582f401..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure04.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [ , 2] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure05.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure05.yml deleted file mode 100644 index f1c6a93e1f..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure05.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [ 1, ] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure06.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure06.yml deleted file mode 100644 index b0ef54b0eb..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure06.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [ 0 , 0 ] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure07.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure07.yml deleted file mode 100644 index afd999f575..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure07.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [ @ , 1 ] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure08.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure08.yml deleted file mode 100644 index 60efc99273..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure08.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [ 1.0 , 2.0 ] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure09.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure09.yml deleted file mode 100644 index d6ec7eabe6..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure09.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [ "1" , "2" ] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure10.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure10.yml deleted file mode 100644 index 27de429186..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure10.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [ ] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure11.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure11.yml deleted file mode 100644 index 5bdae3a5f5..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure11.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: [ UNBOUNDED , UNBOUNDED ] - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure31.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure31.yml deleted file mode 100644 index 8c3034afce..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure31.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ 2, 1] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure32.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure32.yml deleted file mode 100644 index 4b5eba9110..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure32.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ -1, 2] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure33.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure33.yml deleted file mode 100644 index 9c42e22aa1..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure33.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ 1, -2] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure34.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure34.yml deleted file mode 100644 index 49953b5834..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure34.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ , 2] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure35.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure35.yml deleted file mode 100644 index 8d8985d7f7..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure35.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ 1 , ] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure36.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure36.yml deleted file mode 100644 index 12944507f6..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure36.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ 0 , 0 ] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure37.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure37.yml deleted file mode 100644 index 618c980e16..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure37.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ 0 , # ] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure38.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure38.yml deleted file mode 100644 index d0c4575c83..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure38.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ 1.0 , 2.0 ] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure39.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure39.yml deleted file mode 100644 index 024338d380..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure39.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ "1" , "2" ] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure40.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure40.yml deleted file mode 100644 index a4a32ba772..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure40.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ ] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure41.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure41.yml deleted file mode 100644 index c3024a3ee4..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/occurencyFalure41.yml +++ /dev/null @@ -1,35 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.MyCompute: - derived_from: tosca.nodes.Root - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: map - entry_schema: - type: tosca.datatypes.network.NetworkInfo - ports: - type: map - entry_schema: - type: tosca.datatypes.network.PortInfo - requirements: - - local_storage100: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - capabilities: - host: - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - endpoint100 : - type: tosca.capabilities.Endpoint.Admin - occurrences: [ UNBOUNDED, UNBOUNDED ] - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - binding: - type: tosca.capabilities.network.Bindable \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/softwareComponentReq11.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/softwareComponentReq11.yml deleted file mode 100644 index b9bda183e6..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/softwareComponentReq11.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vfc.vfc4: - derived_from: tosca.nodes.Root - properties: - # domain-specific software component version - component_version: - type: version - required: false - admin_credential: - type: tosca.datatypes.Credential - required: false - requirements: - - host: - capability: tosca.capabilities.Container - relationship: tosca.relationships.HostedOn - occurrences: [1, 1] diff --git a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/softwareComponentReq12.yml b/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/softwareComponentReq12.yml deleted file mode 100644 index 9676bcdb6c..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/importToscaResourceByCreateUrl/softwareComponentReq12.yml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vfc.vfc1: - derived_from: tosca.nodes.Root - properties: - # domain-specific software component version - component_version: - type: version - required: false - admin_credential: - type: tosca.datatypes.Credential - required: false - requirements: - - host: - capability: tosca.capabilities.Container - relationship: tosca.relationships.HostedOn - occurrences: [1, 2] diff --git a/test-apis-ci/src/test/resources/CI/tests/tenantIsolationCI/aai_error.properties b/test-apis-ci/src/test/resources/CI/tests/tenantIsolationCI/aai_error.properties deleted file mode 100644 index b4ae9e332b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tenantIsolationCI/aai_error.properties +++ /dev/null @@ -1,10 +0,0 @@ -400=Bad Request -401=Unauthorized -403=Forbidden -404=Not Found -405=Method Not Allowed -409=The request could not be completed due to a conflict with the current state of the target resource -410=You are using a version of the API that has been retired -412=Precondition failed -415=Unsupported Media Type -500=Internal Server Error \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/testCsarAPI/topology.txt b/test-apis-ci/src/test/resources/CI/tests/testCsarAPI/topology.txt deleted file mode 100644 index f46af26605..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/testCsarAPI/topology.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"c25811fc-e03f-401d-93ca-45d9bd312703","delegateId":"17710a88-f3d8-483d-aded-afee2906a8c1","delegateType":"topologytemplate","dependencies":[{"name":"tosca-normative-types-softwareComponent","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-webServer","version":"1.0.0.wd03-SNAPSHOT"},{"name":"apache-type","version":"2.0.0-SNAPSHOT"},{"name":"tosca-normative-types-compute","version":"1.0.0.wd03-SNAPSHOT"},{"name":"tosca-normative-types-root","version":"1.0.0.wd03-SNAPSHOT"}],"nodeTemplates":[{"key":"Compute_2","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}},{"key":"Apache","value":{"type":"alien.nodes.Apache","name":null,"properties":{"port":"80","document_root":"/var/www","version":"2.4"},"attributes":{"tosca_id":null,"tosca_name":null},"relationships":{"attachToCompute_2":{"type":"tosca.relationships.AttachTo","target":"Compute_2","requirementName":"dependency","requirementType":"tosca.capabilities.Root","targetedCapabilityName":"attach"}},"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"host":{"type":"tosca.nodes.Compute","properties":null}},"capabilities":{"secure_endpoint":{"type":"tosca.capabilities.Endpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"app_endpoint":{"type":"tosca.capabilities.Endpoint","properties":{"port":null,"protocol":{"value":"tcp","definition":false},"url_path":null,"secure":{"value":"false","definition":false}}},"host":{"type":"alien.capabilities.ApacheContainer","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null}},"artifacts":null}},{"key":"Compute","value":{"type":"tosca.nodes.Compute","name":null,"properties":{"disk_size":null,"num_cpus":null,"os_distribution":null,"os_arch":null,"mem_size":null,"os_type":null,"os_version":null},"attributes":{"ip_address":null,"tosca_id":null,"tosca_name":null},"relationships":null,"requirements":{"dependency":{"type":"tosca.capabilities.Root","properties":null},"network":{"type":"tosca.capabilities.Connectivity","properties":null}},"capabilities":{"host":{"type":"tosca.capabilities.Container","properties":{"valid_node_types":null}},"root":{"type":"tosca.capabilities.Root","properties":null},"attach":{"type":"tosca.capabilities.Attachment","properties":null},"scalable":{"type":"tosca.capabilities.Scalable","properties":{"max_intances":{"value":"1","definition":false},"default_instances":{"value":"1","definition":false},"min_intances":{"value":"1","definition":false}}}},"artifacts":null}}]} \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/testCsarAPI/topologyTemplate.txt b/test-apis-ci/src/test/resources/CI/tests/testCsarAPI/topologyTemplate.txt deleted file mode 100644 index f3fdf0297b..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/testCsarAPI/topologyTemplate.txt +++ /dev/null @@ -1 +0,0 @@ -{"id":"17710a88-f3d8-483d-aded-afee2906a8c1","name":"MichaelTest2","description":null,"topologyId":"c25811fc-e03f-401d-93ca-45d9bd312703"} \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool10_false.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool10_false.yaml deleted file mode 100644 index b6faadd4f9..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool10_false.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: NO - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool11_false.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool11_false.yaml deleted file mode 100644 index 7fb2923b04..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool11_false.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: 0 - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool12_false.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool12_false.yaml deleted file mode 100644 index fd451aa3af..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool12_false.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: OFF - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool1_true.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool1_true.yaml deleted file mode 100644 index a253e4c8d7..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool1_true.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: t - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool2_true.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool2_true.yaml deleted file mode 100644 index ce273b3522..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool2_true.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: true - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool3_true.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool3_true.yaml deleted file mode 100644 index 4680eb6996..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool3_true.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: on - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool4_true.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool4_true.yaml deleted file mode 100644 index 1ed7781831..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool4_true.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: y - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool5_true.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool5_true.yaml deleted file mode 100644 index c0b42e6288..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool5_true.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: yes - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool6_true.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool6_true.yaml deleted file mode 100644 index 24b862b751..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool6_true.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: 1 - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool7_false.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool7_false.yaml deleted file mode 100644 index 7bad8efd6f..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool7_false.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: F - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool8_false.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool8_false.yaml deleted file mode 100644 index 8b35e2adf7..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool8_false.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: FALSE - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool9_false.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool9_false.yaml deleted file mode 100644 index 2768e0d480..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_bool9_false.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: N - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_number1.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_number1.yaml deleted file mode 100644 index fc7f84ca81..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_number1.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: number - description: city name - default: 12 - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_number2.yaml b/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_number2.yaml deleted file mode 100644 index 28ec3358be..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/tmp/positive_artifact_number2.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: number - description: city name - default: 12.12 - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/artifact_unsupported.yaml b/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/artifact_unsupported.yaml deleted file mode 100644 index 764b8d4c58..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/artifact_unsupported.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: number123 - description: city name - default: 12.12 - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_bool1.yaml b/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_bool1.yaml deleted file mode 100644 index 19119f3d9a..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_bool1.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: K - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_bool2.yaml b/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_bool2.yaml deleted file mode 100644 index f9c09a4fed..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_bool2.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: boolean - description: city name - default: 11 - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_number1.yaml b/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_number1.yaml deleted file mode 100644 index 9a489879cc..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_number1.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: number - description: city name - default: 1.2Noo - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_number2.yaml b/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_number2.yaml deleted file mode 100644 index 4c0e07affc..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_number2.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: number - description: city name - default: 1 2 3 - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_string1.yaml b/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_string1.yaml deleted file mode 100644 index f52ef04712..0000000000 --- a/test-apis-ci/src/test/resources/CI/tests/yamlFieldsValidation/negative_artifact_string1.yaml +++ /dev/null @@ -1,140 +0,0 @@ -heat_template_version: 2013-05-23 -################################# -# -# Changes in v0.2: -# - Unique availability zone for each VM -# - LAN8 and SLAN networks removed according to latest Prod/Type I diagram -# - 2 DB VMs added -# - Images corrected -# - VM start-up order: SMP->DB->BE->FE (no error handling yet) -# - Provisioning scripts placeholders -# -################################# - -description: ASC Template - -parameters: - city_name: - type: string - description: city name - default: שלום - address: - type: string - description: address - default: Alonim - home_number: - type: number - description: home_number - default: 8 -resources: -# scp_be_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_be_wait_handle } -# count: 5 -# timeout: 300 -# scp_be_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# scp_fe_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: scp_fe_wait_handle } -# count: 2 -# timeout: 300 -# scp_fe_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# smp_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: smp_wait_handle } -# count: 2 -# timeout: 300 -# smp_wait_handle: -# type: OS::Heat::WaitConditionHandle -# -# db_wait_condition: -# type: OS::Heat::WaitCondition -# properties: -# handle: { get_resource: db_wait_handle } -# count: 2 -# timeout: 300 -# db_wait_handle: -# type: OS::Heat::WaitConditionHandle - - FE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - BE_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - SMP_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - DB_Affinity: - type: OS::Nova::ServerGroup - properties: - policies: ["anti-affinity"] - - FE_Clustering_KA: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_fe_cluster_net_id } - - FE_Clustering_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: FE_Clustering_KA } - cidr: { get_param: int_vscp_fe_cluster_cidr } - - Clustering_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_cluster_net_id } - - Clustering_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: Clustering_Network } - cidr: { get_param: int_vscp_cluster_cidr } - - DB_Network: - type: OS::Contrail::VirtualNetwork - properties: - name: { get_param: int_vscp_db_network_net_id } - - DB_Network_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: DB_Network } - cidr: { get_param: int_vscp_db_network_cidr } - - server_scp_be0: - type: OS::Nova::Server -# depends on: db_wait_condition - properties: - name: { get_param: vm_scp_be0_name } - image: { get_param: image_scp_be_id } -# availability_zone: { get_param: availability_zone_be0 } - flavor: { get_param: flavor_scp_be_id } - scheduler_hints: { group: { get_resource: BE_Affinity } } - networks: - - port: { get_resource: be0_port_3 } - - port: { get_resource: be0_port_4 } - - port: { get_resource: be0_port_5 } - - port: { get_resource: be0_port_7 } - metadata: - vnf_id: { get_param: vnf_id } - user_data: - str_replace: - template: | - #!/bin/bash - #todo: provision $vm_name - wc_notify --data-binary '{"status": "SUCCESS"}' - params: - $vm_name: {get_param: vm_scp_be0_name} -# wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } diff --git a/test-apis-ci/src/test/resources/catalogMgmtTest.properties b/test-apis-ci/src/test/resources/catalogMgmtTest.properties deleted file mode 100644 index c65c6244f2..0000000000 --- a/test-apis-ci/src/test/resources/catalogMgmtTest.properties +++ /dev/null @@ -1,34 +0,0 @@ -TransportType=DME2 -Latitude =32.109333 -Longitude =34.855499 -Version =1.0 -ServiceName =dmaap-v1.onap.org/events -Environment =TEST -Partner=BOT_R -routeOffer=MR1 -SubContextPath =/ -Protocol =http -MethodType =POST -username =onapdemo -password =Aa123456 -contenttype = application/json -Authorization = Basic b25hcGRlbW86QWExMjM0NTY= -authKey= -authDate= -#Dmaap Server Url port 3904-HTTP 3905-https -host=demo.onap.org:3904 -###topic=com.att.ccd.CCD-CatalogManagement-go539p or com.att.sdc.SDCforTestDev | com.att.sdc.23911-SDCforTestDev-v001 -topic=com.att.sdc.23911-SDCforTestDev-v001 -partition=1 -maxBatchSize=100 -maxAgeMs=250 -AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler -AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler -AFT_DME2_REQ_TRACE_ON=true -AFT_ENVIRONMENT=AFTUAT -AFT_DME2_EP_CONN_TIMEOUT=15000 -AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000 -AFT_DME2_EP_READ_TIMEOUT_MS=50000 -sessionstickinessrequired=NO -DME2preferredRouterFilePath=src/test/resources/preferredRouter.txt -MessageSentThreadOccurance=50 \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/catalogMgmtTest.yaml b/test-apis-ci/src/test/resources/catalogMgmtTest.yaml deleted file mode 100644 index ee419f4f50..0000000000 --- a/test-apis-ci/src/test/resources/catalogMgmtTest.yaml +++ /dev/null @@ -1,6 +0,0 @@ -publisherPropertiesFilePath: "catalogMgmtTest.properties" -topicMessages: - - "{\"transactionId\": \"221e8cbe-493d-4848-b46c-a552b8928075\",\"notificationReason\":[\"product\"],\"republish\":\"No\",\"Authorization\": \"Basic bTEzMzMxQGNjZC5hdHQuY29tOkFhMTIzNDU2\"}" - #- "{\"transactionId\": \"221e8cbe-493d-4848-b46c-a552b8928075\",\"notificationReason\":[\"logo\"],\"republish\":\"No\"}" - #- "{\"transactionId\": \"221e8cbe-493d-4848-b46c-a552b8928075\",\"notificationReason\":[\"availabilitymatrix\"],\"republish\":\"No\"}" - #- "{\"transactionId\": \"221e8cbe-493d-4848-b46c-a552b8928075\",\"notificationReason\":[\"product\",\"availabilitymatrix\"],\"republish\":\"No\"}" \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/config.json b/test-apis-ci/src/test/resources/config.json deleted file mode 100644 index 86905518b6..0000000000 --- a/test-apis-ci/src/test/resources/config.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - -"catalogBeHost": "behost", -"catalogFeHost": "fehost", -"esHost": "eshost", -"catalogFePort": 8080, -"catalogBePort": 8080, -"esPort": 9200, -"resourceConfigDir": "src/test/resources/CI/tests", -"componentsConfigDir": "src/test/resources/CI/components" - -} \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/config/configuration1.yaml b/test-apis-ci/src/test/resources/config/configuration1.yaml deleted file mode 100644 index 12ab2c777f..0000000000 --- a/test-apis-ci/src/test/resources/config/configuration1.yaml +++ /dev/null @@ -1,17 +0,0 @@ -version: 1.0 -released: 2012-11-30 - -# Connection parameters -connection: - url: jdbc:mysql://localhost:3306/db - poolSize: 5 - -# Protocols -protocols: - - http - - https - -# Users -users: - tom: passwd - bob: passwd \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/config/elasticsearch.yml b/test-apis-ci/src/test/resources/config/elasticsearch.yml deleted file mode 100644 index a6a2c1b950..0000000000 --- a/test-apis-ci/src/test/resources/config/elasticsearch.yml +++ /dev/null @@ -1,387 +0,0 @@ - -cluster.name: elasticsearch_1_5_2 - -discovery.zen.ping.multicast.enabled: false -discovery.zen.ping.unicast.enabled: true -discovery.zen.ping.unicast.hosts: elasticsearch_host - - - -##################### Elasticsearch Configuration Example ##################### - -# This file contains an overview of various configuration settings, -# targeted at operations staff. Application developers should -# consult the guide at . -# -# The installation procedure is covered at -# . -# -# Elasticsearch comes with reasonable defaults for most settings, -# so you can try it out without bothering with configuration. -# -# Most of the time, these defaults are just fine for running a production -# cluster. If you're fine-tuning your cluster, or wondering about the -# effect of certain configuration option, please _do ask_ on the -# mailing list or IRC channel [http://elasticsearch.org/community]. - -# Any element in the configuration can be replaced with environment variables -# by placing them in ${...} notation. For example: -# -# node.rack: ${RACK_ENV_VAR} - -# For information on supported formats and syntax for the config file, see -# - - -################################### Cluster ################################### - -# Cluster name identifies your cluster for auto-discovery. If you're running -# multiple clusters on the same network, make sure you're using unique names. -# -# cluster.name: elasticsearch - - -#################################### Node ##################################### - -# Node names are generated dynamically on startup, so you're relieved -# from configuring them manually. You can tie this node to a specific name: -# -# node.name: "Franz Kafka" - -# Every node can be configured to allow or deny being eligible as the master, -# and to allow or deny to store the data. -# -# Allow this node to be eligible as a master node (enabled by default): -# -# node.master: true -# -# Allow this node to store data (enabled by default): -# -# node.data: true - -# You can exploit these settings to design advanced cluster topologies. -# -# 1. You want this node to never become a master node, only to hold data. -# This will be the "workhorse" of your cluster. -# -# node.master: false -# node.data: true -# -# 2. You want this node to only serve as a master: to not store any data and -# to have free resources. This will be the "coordinator" of your cluster. -# -# node.master: true -# node.data: false -# -# 3. You want this node to be neither master nor data node, but -# to act as a "search load balancer" (fetching data from nodes, -# aggregating results, etc.) -# -# node.master: false -# node.data: false - -# Use the Cluster Health API [http://localhost:9200/_cluster/health], the -# Node Info API [http://localhost:9200/_nodes] or GUI tools -# such as , -# , -# and -# to inspect the cluster state. - -# A node can have generic attributes associated with it, which can later be used -# for customized shard allocation filtering, or allocation awareness. An attribute -# is a simple key value pair, similar to node.key: value, here is an example: -# -# node.rack: rack314 - -# By default, multiple nodes are allowed to start from the same installation location -# to disable it, set the following: -# node.max_local_storage_nodes: 1 - - -#################################### Index #################################### - -# You can set a number of options (such as shard/replica options, mapping -# or analyzer definitions, translog settings, ...) for indices globally, -# in this file. -# -# Note, that it makes more sense to configure index settings specifically for -# a certain index, either when creating it or by using the index templates API. -# -# See and -# -# for more information. - -# Set the number of shards (splits) of an index (5 by default): -# -# index.number_of_shards: 5 - -# Set the number of replicas (additional copies) of an index (1 by default): -# -# index.number_of_replicas: 1 - -# Note, that for development on a local machine, with small indices, it usually -# makes sense to "disable" the distributed features: -# -index.number_of_shards: 1 -index.number_of_replicas: 0 - -# These settings directly affect the performance of index and search operations -# in your cluster. Assuming you have enough machines to hold shards and -# replicas, the rule of thumb is: -# -# 1. Having more *shards* enhances the _indexing_ performance and allows to -# _distribute_ a big index across machines. -# 2. Having more *replicas* enhances the _search_ performance and improves the -# cluster _availability_. -# -# The "number_of_shards" is a one-time setting for an index. -# -# The "number_of_replicas" can be increased or decreased anytime, -# by using the Index Update Settings API. -# -# Elasticsearch takes care about load balancing, relocating, gathering the -# results from nodes, etc. Experiment with different settings to fine-tune -# your setup. - -# Use the Index Status API () to inspect -# the index status. - - -#################################### Paths #################################### - -# Path to directory containing configuration (this file and logging.yml): -# -path.conf: /src/test/resources - -# Path to directory where to store index data allocated for this node. -# -path.data: target/esdata -# -# Can optionally include more than one location, causing data to be striped across -# the locations (a la RAID 0) on a file level, favouring locations with most free -# space on creation. For example: -# -# path.data: /path/to/data1,/path/to/data2 - -# Path to temporary files: -# -path.work: /target/eswork - -# Path to log files: -# -path.logs: /target/eslogs - -# Path to where plugins are installed: -# -# path.plugins: /path/to/plugins - - -#################################### Plugin ################################### - -# If a plugin listed here is not installed for current node, the node will not start. -# -# plugin.mandatory: mapper-attachments,lang-groovy - - -################################### Memory #################################### - -# Elasticsearch performs poorly when JVM starts swapping: you should ensure that -# it _never_ swaps. -# -# Set this property to true to lock the memory: -# -# bootstrap.mlockall: true - -# Make sure that the ES_MIN_MEM and ES_MAX_MEM environment variables are set -# to the same value, and that the machine has enough memory to allocate -# for Elasticsearch, leaving enough memory for the operating system itself. -# -# You should also make sure that the Elasticsearch process is allowed to lock -# the memory, eg. by using `ulimit -l unlimited`. - - -############################## Network And HTTP ############################### - -# Elasticsearch, by default, binds itself to the 0.0.0.0 address, and listens -# on port [9200-9300] for HTTP traffic and on port [9300-9400] for node-to-node -# communication. (the range means that if the port is busy, it will automatically -# try the next port). - -# Set the bind address specifically (IPv4 or IPv6): -# -# network.bind_host: 192.168.0.1 - -# Set the address other nodes will use to communicate with this node. If not -# set, it is automatically derived. It must point to an actual IP address. -# -# network.publish_host: 192.168.0.1 - -# Set both 'bind_host' and 'publish_host': -# -# network.host: 192.168.0.1 - -# Set a custom port for the node to node communication (9300 by default): -# -# transport.tcp.port: 9300 - -# Enable compression for all communication between nodes (disabled by default): -# -# transport.tcp.compress: true - -# Set a custom port to listen for HTTP traffic: -# -# http.port: 9200 - -# Set a custom allowed content length: -# -# http.max_content_length: 100mb - -# Disable HTTP completely: -# -# http.enabled: false - - -################################### Gateway ################################### - -# The gateway allows for persisting the cluster state between full cluster -# restarts. Every change to the state (such as adding an index) will be stored -# in the gateway, and when the cluster starts up for the first time, -# it will read its state from the gateway. - -# There are several types of gateway implementations. For more information, see -# . - -# The default gateway type is the "local" gateway (recommended): -# -# gateway.type: local - -# Settings below control how and when to start the initial recovery process on -# a full cluster restart (to reuse as much local data as possible when using shared -# gateway). - -# Allow recovery process after N nodes in a cluster are up: -# -gateway.recover_after_nodes: 1 - -# Set the timeout to initiate the recovery process, once the N nodes -# from previous setting are up (accepts time value): -# -# gateway.recover_after_time: 5m - -# Set how many nodes are expected in this cluster. Once these N nodes -# are up (and recover_after_nodes is met), begin recovery process immediately -# (without waiting for recover_after_time to expire): -# -gateway.expected_nodes: 1 - - -############################# Recovery Throttling ############################# - -# These settings allow to control the process of shards allocation between -# nodes during initial recovery, replica allocation, rebalancing, -# or when adding and removing nodes. - -# Set the number of concurrent recoveries happening on a node: -# -# 1. During the initial recovery -# -# cluster.routing.allocation.node_initial_primaries_recoveries: 4 -# -# 2. During adding/removing nodes, rebalancing, etc -# -# cluster.routing.allocation.node_concurrent_recoveries: 2 - -# Set to throttle throughput when recovering (eg. 100mb, by default 20mb): -# -# indices.recovery.max_bytes_per_sec: 20mb - -# Set to limit the number of open concurrent streams when -# recovering a shard from a peer: -# -# indices.recovery.concurrent_streams: 5 - - -################################## Discovery ################################## - -# Discovery infrastructure ensures nodes can be found within a cluster -# and master node is elected. Multicast discovery is the default. - -# Set to ensure a node sees N other master eligible nodes to be considered -# operational within the cluster. Its recommended to set it to a higher value -# than 1 when running more than 2 nodes in the cluster. -# -# discovery.zen.minimum_master_nodes: 1 - -# Set the time to wait for ping responses from other nodes when discovering. -# Set this option to a higher value on a slow or congested network -# to minimize discovery failures: -# -# discovery.zen.ping.timeout: 3s - -# For more information, see -# - -# Unicast discovery allows to explicitly control which nodes will be used -# to discover the cluster. It can be used when multicast is not present, -# or to restrict the cluster communication-wise. -# -# 1. Disable multicast discovery (enabled by default): -# -# discovery.zen.ping.multicast.enabled: false -# -# 2. Configure an initial list of master nodes in the cluster -# to perform discovery when new nodes (master or data) are started: -# -# discovery.zen.ping.unicast.hosts: ["host1", "host2:port"] - -# EC2 discovery allows to use AWS EC2 API in order to perform discovery. -# -# You have to install the cloud-aws plugin for enabling the EC2 discovery. -# -# For more information, see -# -# -# See -# for a step-by-step tutorial. - -# GCE discovery allows to use Google Compute Engine API in order to perform discovery. -# -# You have to install the cloud-gce plugin for enabling the GCE discovery. -# -# For more information, see . - -# Azure discovery allows to use Azure API in order to perform discovery. -# -# You have to install the cloud-azure plugin for enabling the Azure discovery. -# -# For more information, see . - -################################## Slow Log ################################## - -# Shard level query and fetch threshold logging. - -#index.search.slowlog.threshold.query.warn: 10s -#index.search.slowlog.threshold.query.info: 5s -#index.search.slowlog.threshold.query.debug: 2s -#index.search.slowlog.threshold.query.trace: 500ms - -#index.search.slowlog.threshold.fetch.warn: 1s -#index.search.slowlog.threshold.fetch.info: 800ms -#index.search.slowlog.threshold.fetch.debug: 500ms -#index.search.slowlog.threshold.fetch.trace: 200ms - -#index.indexing.slowlog.threshold.index.warn: 10s -#index.indexing.slowlog.threshold.index.info: 5s -#index.indexing.slowlog.threshold.index.debug: 2s -#index.indexing.slowlog.threshold.index.trace: 500ms - -################################## GC Logging ################################ - -#monitor.jvm.gc.young.warn: 1000ms -#monitor.jvm.gc.young.info: 700ms -#monitor.jvm.gc.young.debug: 400ms - -#monitor.jvm.gc.old.warn: 10s -#monitor.jvm.gc.old.info: 5s -#monitor.jvm.gc.old.debug: 2s - diff --git a/test-apis-ci/src/test/resources/config/test-apis-ci/DME2preferredRouter.txt b/test-apis-ci/src/test/resources/config/test-apis-ci/DME2preferredRouter.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml b/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml deleted file mode 100644 index 6943e9b024..0000000000 --- a/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml +++ /dev/null @@ -1,415 +0,0 @@ -identificationHeaderFields: - - HTTP_IV_USER - - HTTP_CSP_FIRSTNAME - - HTTP_CSP_LASTNAME - - HTTP_IV_REMOTE_ADDRESS - - HTTP_CSP_WSTYPE - -# catalog backend hostname -beFqdn: localhost -# sdccatalog.att.com - -# catalog backend http port -beHttpPort: 8080 - -# catalog backend http context -beContext: /sdc/rest/config/get - -# catalog backend protocol -beProtocol: http - -# catalog backend ssl port -beSslPort: 8443 - -version: 1.1.0 -released: 2012-11-30 -toscaConformanceLevel: 8.0 -minToscaConformanceLevel: 3.0 - -janusGraphCfgFile: /home/vagrant/catalog-be/config/catalog-be/janusgraph.properties -janusGraphInMemoryGraph: false -janusGraphLockTimeout: 1800 - -# The interval to try and reconnect to janusGraph DB when it is down during ASDC startup: -janusGraphReconnectIntervalInSeconds: 3 - -# The read timeout towards JanusGraph DB when health check is invoked: -janusGraphHealthCheckReadTimeout: 1 - -# The interval to try and reconnect to Elasticsearch when it is down during ASDC startup: -esReconnectIntervalInSeconds: 3 -uebHealthCheckReconnectIntervalInSeconds: 15 -uebHealthCheckReadTimeout: 4 - -# Protocols -protocols: - - http - - https - -# Default imports -defaultImports: - - nodes: - file: nodes.yml - - datatypes: - file: data.yml - - capabilities: - file: capabilities.yml - - relationships: - file: relationships.yml - - groups: - file: groups.yml - - policies: - file: policies.yml - -# Users -users: - tom: passwd - bob: passwd - -neo4j: - host: neo4jhost - port: 7474 - user: neo4j - password: "Pass" - -cassandraConfig: - cassandraHosts: ['localhost'] - localDataCenter: datacenter1 - reconnectTimeout : 30000 - authenticate: false - username: koko - password: "Pass" - ssl: false - truststorePath : /path/path - truststorePassword : "Pass" - keySpaces: - - { name: sdcaudit, replicationStrategy: SimpleStrategy, replicationInfo: ['1']} - - { name: sdcartifact, replicationStrategy: SimpleStrategy, replicationInfo: ['1']} - - { name: sdccomponent, replicationStrategy: SimpleStrategy, replicationInfo: ['1']} - - { name: sdcrepository, replicationStrategy: SimpleStrategy, replicationInfo: ['1']} - -#Application-specific settings of ES -elasticSearch: - # Mapping of index prefix to time-based frame. For example, if below is configured: - # - # - indexPrefix: auditingevents - # creationPeriod: minute - # - # then ES object of type which is mapped to "auditingevents-*" template, and created on 2015-12-23 13:24:54, will enter "auditingevents-2015-12-23-13-24" index. - # Another object created on 2015-12-23 13:25:54, will enter "auditingevents-2015-12-23-13-25" index. - # If creationPeriod: month, both of the above will enter "auditingevents-2015-12" index. - # - # PLEASE NOTE: the timestamps are created in UTC/GMT timezone! This is needed so that timestamps will be correctly presented in Kibana. - # - # Legal values for creationPeriod - year, month, day, hour, minute, none (meaning no time-based behaviour). - # - # If no creationPeriod is configured for indexPrefix, default behavour is creationPeriod: month. - - indicesTimeFrequency: - - indexPrefix: auditingevents - creationPeriod: month - - indexPrefix: monitoring_events - creationPeriod: month - -licenseTypes: - - User - - Installation - - CPU - -#Deployment artifacts placeHolder -resourceTypes: &allResourceTypes - - VFC - - CP - - VL - - VF - - VFCMT - - Abstract - - CVFC - -# validForResourceTypes usage -# validForResourceTypes: -# - VF -# - VL -deploymentResourceArtifacts: -# heat: -# displayName: "Base HEAT Template" -# type: HEAT -# validForResourceTypes: *allResourceTypes -# heatVol: -# displayName: "Volume HEAT Template" -# type: HEAT_VOL -# validForResourceTypes: *allResourceTypes -# heatNet: -# displayName: "Network HEAT Template" -# type: HEAT_NET -# validForResourceTypes: *allResourceTypes - -deploymentResourceInstanceArtifacts: - heatEnv: - displayName: "HEAT ENV" - type: HEAT_ENV - description: "Auto-generated HEAT Environment deployment artifact" - fileExtension: "env" - VfHeatEnv: - displayName: "VF HEAT ENV" - type: HEAT_ENV - description: "VF Auto-generated HEAT Environment deployment artifact" - fileExtension: "env" - -#tosca artifacts placeholders -toscaArtifacts: - assetToscaTemplate: - artifactName: -template.yml - displayName: Tosca Template - type: TOSCA_TEMPLATE - description: TOSCA representation of the asset - assetToscaCsar: - artifactName: -csar.csar - displayName: Tosca Model - type: TOSCA_CSAR - description: TOSCA definition package of the asset - - -#Informational artifacts placeHolder -excludeResourceCategory: - - Generic -excludeResourceType: - - PNF -informationalResourceArtifacts: - features: - displayName: Features - type: OTHER - capacity: - displayName: Capacity - type: OTHER - vendorTestResult: - displayName: Vendor Test Result - type: OTHER - testScripts: - displayName: Test Scripts - type: OTHER - CloudQuestionnaire: - displayName: Cloud Questionnaire (completed) - type: OTHER - HEATTemplateFromVendor: - displayName: HEAT Template from Vendor - type: HEAT - resourceSecurityTemplate: - displayName: Resource Security Template - type: OTHER - -excludeServiceCategory: - -informationalServiceArtifacts: - serviceArtifactPlan: - displayName: Service Artifact Plan - type: OTHER - summaryOfImpactsToECOMPElements: - displayName: Summary of impacts to ECOMP elements,OSSs, BSSs - type: OTHER - controlLoopFunctions: - displayName: Control Loop Functions - type: OTHER - dimensioningInfo: - displayName: Dimensioning Info - type: OTHER - affinityRules: - displayName: Affinity Rules - type: OTHER - operationalPolicies: - displayName: Operational Policies - type: OTHER - serviceSpecificPolicies: - displayName: Service-specific Policies - type: OTHER - engineeringRules: - displayName: Engineering Rules (ERD) - type: OTHER - distributionInstructions: - displayName: Distribution Instructions - type: OTHER - certificationTestResults: - displayName: TD Certification Test Results - type: OTHER - deploymentVotingRecord: - displayName: Deployment Voting Record - type: OTHER - serviceQuestionnaire: - displayName: Service Questionnaire - type: OTHER - serviceSecurityTemplate: - displayName: Service Security Template - type: OTHER - -serviceApiArtifacts: - configuration: - displayName: Configuration - type: OTHER - instantiation: - displayName: Instantiation - type: OTHER - monitoring: - displayName: Monitoring - type: OTHER - reporting: - displayName: Reporting - type: OTHER - logging: - displayName: Logging - type: OTHER - testing: - displayName: Testing - type: OTHER - -additionalInformationMaxNumberOfKeys: 50 - -systemMonitoring: - enabled: false - isProxy: false - probeIntervalInSeconds: 15 - -defaultHeatArtifactTimeoutMinutes: 60 - -requirementsToFulfillBeforeCert: - -capabilitiesToConsumeBeforeCert: - -unLoggedUrls: - - /sdc2/rest/healthCheck - -cleanComponentsConfiguration: - cleanIntervalInMinutes: 1440 - componentsToClean: - - Resource - - Service - -artifactsIndex: resources - -heatEnvArtifactHeader: "" -heatEnvArtifactFooter: "" - -onboarding: - protocol: http - host: localhost - port: 8080 - downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages" - healthCheckUri: "/onboarding-api/v1.0/healthcheck" - -dcae: - protocol: http - host: 127.0.0.1 - port: 8080 - healthCheckUri: "/dcae/healthCheck" - -switchoverDetector: - gBeFqdn: Onap - gFeFqdn: Onap - beVip: 0.0.0.0 - feVip: 0.0.0.0 - beResolveAttempts: 3 - feResolveAttempts: 3 - enabled: false - interval: 60 - changePriorityUser: Onap.Sdc - changePriorityPassword: "Pass" - publishNetworkUrl: "http://xxx.com/crt/CipDomain.ECOMP-ASDC-DEVST/config/update_network?user=root" - publishNetworkBody: '{"note":"publish network"}' - groups: - beSet: { changePriorityUrl: "http://xxx.com/crt/CipDomain.ECOMP-ASDC-DEVST/config/sites/AIO-BE.ecomp.idns.com?user=root", - changePriorityBody: '{"name":"AIO-BE.ecomp.idns.com","uri":"/crt/CipDomain.ECOMP-ASDC-DEVST/config/sites/AIO-BE.ecomp.idns.com","no_ad_redirection":false,"v4groups":{"failover_groups":["/crt/CipDomain.ECOMP-ASDC-DEVST/config/groups/group_mg_be","/crt/CipDomain.ECOMP-ASDC-DEVST/config/groups/group_bs_be"],"failover_policy":["FAILALL"]},"comment":"AIO BE G-fqdn","intended_app_proto":"DNS"}'} - feSet: { changePriorityUrl: "http://xxx.com/crt/CipDomain.ECOMP-ASDC-DEVST/config/sites/AIO-FE.ecomp.idns.com?user=root", - changePriorityBody: '{"comment":"AIO G-fqdn","name":"AIO-FE.ecomp.idns.com","v4groups":{"failover_groups":["/crt/CipDomain.ECOMP-ASDC-DEVST/config/groups/group_mg_fe","/crt/CipDomain.ECOMP-ASDC-DEVST/config/groups/group_bs_fe"],"failover_policy":["FAILALL"]},"no_ad_redirection":false,"intended_app_proto":"DNS","uri":"/crt/CipDomain.ECOMP-ASDC-DEVST/config/sites/AIO-FE.ecomp.idns.com"}'} - -applicationL1Cache: - datatypes: - enabled: true - firstRunDelay: 10 - pollIntervalInSec: 60 - -applicationL2Cache: - enabled: true - catalogL1Cache: - enabled: true - resourcesSizeInCache: 300 - servicesSizeInCache: 200 - productsSizeInCache: 100 - queue: - syncIntervalInSecondes: 43200 - waitOnShutDownInMinutes: 10 - numberOfCacheWorkers: 4 - -toscaValidators: - stringMaxLength: 2500 - -disableAudit: false - -vfModuleProperties: - min_vf_module_instances: - forBaseModule: 1 - forNonBaseModule: 0 - max_vf_module_instances: - forBaseModule: 1 - forNonBaseModule: - initial_count: - forBaseModule: 1 - forNonBaseModule: 0 - vf_module_type: - forBaseModule: Base - forNonBaseModule: Expansion - -genericAssetNodeTypes: - VFC: org.openecomp.resource.abstract.nodes.VFC - CVFC: org.openecomp.resource.abstract.nodes.VFC - VF : org.openecomp.resource.abstract.nodes.VF - PNF: org.openecomp.resource.abstract.nodes.PNF - Service: org.openecomp.resource.abstract.nodes.service - -workloadContext: Production -environmentContext: - defaultValue: General_Revenue-Bearing - validValues: - - Critical_Revenue-Bearing - - Vital_Revenue-Bearing - - Essential_Revenue-Bearing - - Important_Revenue-Bearing - - Needed_Revenue-Bearing - - Useful_Revenue-Bearing - - General_Revenue-Bearing - - Critical_Non-Revenue - - Vital_Non-Revenue - - Essential_Non-Revenue - - Important_Non-Revenue - - Needed_Non-Revenue - - Useful_Non-Revenue - - General_Non-Revenue - -dmaapConsumerConfiguration: - hosts: Demo.onap.org - consumerGroup: asdc - consumerId: mama - timeoutMs: 15000 - limit: 1 - pollingInterval: 2 - topic: com.att.sdc.23911-SDCforTestDev-v001 - latitude: 32.109333 - longitude: 34.855499 - version: 1.0 - serviceName: dmaap.onap.org/events - environment: TEST - partner: BOT_R - routeOffer: MR1 - protocol: https - contenttype: application/json - dme2TraceOn: true - aftEnvironment: AFTUAT - aftDme2ConnectionTimeoutMs: 15000 - aftDme2RoundtripTimeoutMs: 240000 - aftDme2ReadTimeoutMs: 50000 - dme2preferredRouterFilePath: DME2preferredRouter.txt - timeLimitForNotificationHandleMs: 0 - credential: - username: Onap_demo - password: Pass - -dmeConfiguration: - lookupUriFormat: "http://DME2RESOLVE/service=%s/version=1.0.0/envContext=%s/routeOffer=DEFAULT" diff --git a/test-apis-ci/src/test/resources/config/test-apis-ci/distribution-engine-configuration.yaml b/test-apis-ci/src/test/resources/config/test-apis-ci/distribution-engine-configuration.yaml deleted file mode 100644 index 00ae8f59c0..0000000000 --- a/test-apis-ci/src/test/resources/config/test-apis-ci/distribution-engine-configuration.yaml +++ /dev/null @@ -1,77 +0,0 @@ -uebServers: - - uebsb91kcdc.it.att.com - - uebsb92kcdc.it.att.com -# - uebsb93kcdc.it.att.com - -uebPublicKey: 8F3MDAtMSBwwpSMy - -uebSecretKey: gzFmsTxSCtO5RQfAccM6PqqX - -distributionNotifTopicName: ASDC-DISTR-NOTIF-TOPIC -distributionStatusTopicName: ASDC-DISTR-STATUS-TOPIC - -initRetryIntervalSec: 5 -initMaxIntervalSec: 60 - -distribNotifServiceArtifactTypes: - info: - - MURANO-PKG - -distribNotifResourceArtifactTypes: - lifecycle: - - HEAT - - DG-XML - -environments: - - PROD - -distributionStatusTopic: - pollingIntervalSec: 60 - fetchTimeSec: 15 - consumerGroup: asdc - consumerId: asdc-id - -distributionNotificationTopic: - minThreadPoolSize: 0 - maxThreadPoolSize: 10 - maxWaitingAfterSendingSeconds: 5 - -createTopic: - partitionCount: 1 - replicationCount: 1 - -startDistributionEngine: true - - -aaiConfig: - serverRootUrl: https://127.0.0.1/aai/v1 - resourceNamespaces: - operationalEnvironments: /aai/cloud-infrastructure/operational-environments - - httpRequestConfig: - readTimeoutMs: 5000 - connectTimeoutMs: 1000 - maxReadConnectionRetry: 3 - userName: abcd - password: hmXYcznAljMSisdy8zgcag== - clientSslAuthentication: false - keyStore: opt/app/catalog-be/cert/.keystore - keyStorePassword: hmXYcznAljMSisdy8zgcag== - - httpRequestHeaders: - XFromAppId: asdc - -opEnvRecoveryIntervalSec: 180 -allowedTimeBeforeStaleSec: 300 - -msoConfig: - serverRootUrl: https://127.0.0.1/onap/so/infra/modelDistributions/v1 - resourceNamespaces: - distributions: /distributions - - httpClientConfig: - readTimeout: 2000 - connectTimeout: 500 - numOfRetries: 3 - userName: asdc - password: OTLEp5lfVhYdyw5EAtTUBQ== \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/config/test-apis-ci/ecomp-error-configuration.yaml b/test-apis-ci/src/test/resources/config/test-apis-ci/ecomp-error-configuration.yaml deleted file mode 100644 index 9d7cd74a2b..0000000000 --- a/test-apis-ci/src/test/resources/config/test-apis-ci/ecomp-error-configuration.yaml +++ /dev/null @@ -1,383 +0,0 @@ -########################################### -# Note the conventions of the field values: -# type can be one of: CONFIG_ERROR, SYSTEM_ERROR, DATA_ERROR, CONNECTION_PROBLEM, AUTHENTICATION_PROBLEM -# severity can be one of: WARN, ERROR, FATAL -# alarmSeverity can be one of: CRITICAL,MAJOR,MINOR,INFORMATIONAL,NONE -# code is a unique integer in range of 3003-9999 (3000-3002 are occupied for internal usage) -# The above enumeration values are out-of-the-box and can be changed in code. -# In case of config and code mismatch, the appropriate error will be printed to log -# -## Range of BE codes - 3010-7999 - -errors: - - BeRestApiGeneralError: { - type: SYSTEM_ERROR, - code: ASDC_4000, - severity: ERROR, - description: "Unexpected error during BE REST API execution", - alarmSeverity: CRITICAL - } - - BeHealthCheckError: { - type: SYSTEM_ERROR, - code: ASDC_3010, - severity: ERROR, - description: "Error during BE Health Check", - alarmSeverity: CRITICAL - } - - BeInitializationError: { - type: SYSTEM_ERROR, - code: ASDC_4019, - severity: ERROR, - description: "Catalog-BE was not initialized properly", - alarmSeverity: CRITICAL - } - - BeResourceMissingError: { - type: SYSTEM_ERROR, - code: ASDC_3011, - severity: ERROR, - description: "Mandatory resource %s cannot be found in repository", - alarmSeverity: MAJOR - } - - BeServiceMissingError: { - type: SYSTEM_ERROR, - code: ASDC_3012, - severity: ERROR, - description: "Mandatory service %s cannot be found in repository", - alarmSeverity: MAJOR - } - - BeFailedAddingResourceInstanceError: { - type: SYSTEM_ERROR, - code: ASDC_3013, - severity: ERROR, - description: "Failed to add resource instance of resource %s to service %s", - alarmSeverity: MAJOR - } - - BeIncorrectServiceError: { - type: SYSTEM_ERROR, - code: ASDC_3014, - severity: ERROR, - description: "Service %s is not valid", - alarmSeverity: MAJOR - } - - BeRepositoryDeleteError: { - type: SYSTEM_ERROR, - code: ASDC_3015, - severity: ERROR, - description: "Failed to delete object %s from repository", - alarmSeverity: CRITICAL - } - - BeRepositoryQueryError: { - type: SYSTEM_ERROR, - code: ASDC_3016, - severity: ERROR, - description: "Failed to fetch from repository %s", - alarmSeverity: MAJOR - } - - BeInvalidConfigurationError: { - type: CONFIG_ERROR, - code: ASDC_3017, - severity: FATAL, - description: "Configuration parameter %s is invalid. Value configured is %s", - alarmSeverity: MAJOR - } - - BeUebConnectionError: { - type: CONNECTION_PROBLEM, - code: ASDC_4001, - severity: ERROR, - description: "Connection problem towards U-EB server. Reason: %s", - alarmSeverity: MAJOR - } - - BeUebSystemError: { - type: SYSTEM_ERROR, - code: ASDC_3019, - severity: ERROR, - description: "Error occured during access to U-EB Server. Operation: %s", - alarmSeverity: MAJOR - } - - BeUebObjectNotFoundError: { - type: DATA_ERROR, - code: ASDC_4005, - severity: ERROR, - description: "Error occured during access to U-EB Server. Data not found: %s", - alarmSeverity: MAJOR - } - - BeDistributionEngineSystemError: { - type: SYSTEM_ERROR, - code: ASDC_3021, - severity: ERROR, - description: "Error occured in Distribution Engine. Failed operation: %s", - alarmSeverity: MAJOR - } - - BeUebAuthenticationError: { - type: AUTHENTICATION_PROBLEM, - code: ASDC_4003, - severity: ERROR, - description: "Authentication problem towards U-EB server. Reason: %s", - alarmSeverity: MAJOR - } - - BeUebUnkownHostError: { - type: CONNECTION_PROBLEM, - code: ASDC_4002, - severity: ERROR, - description: "Connection problem towards U-EB server. Cannot reach host %s", - alarmSeverity: MAJOR - } - - BeDistributionEngineInvalidArtifactType: { - type: DATA_ERROR, - code: ASDC_4006, - severity: WARN, - description: "The artifact type %s does not appear in the list of valid artifacts %s", - alarmSeverity: MAJOR - } - BeInvalidTypeError: { - type: DATA_ERROR, - code: ASDC_4008, - severity: WARN, - description: "The type %s of %s is invalid", - alarmSeverity: MAJOR - } - BeInvalidValueError: { - type: DATA_ERROR, - code: ASDC_3028, - severity: WARN, - description: "The value %s of %s from type %s is invalid", - alarmSeverity: MAJOR - } - - BeFailedDeletingResourceInstanceError: { - type: SYSTEM_ERROR, - code: ASDC_3029, - severity: ERROR, - description: "Failed to delete resource instance %s from service %s", - alarmSeverity: MAJOR - } - - BeMissingConfigurationError: { - type: CONFIG_ERROR, - code: ASDC_3030, - severity: FATAL, - description: "Configuration parameter %s is missing", - alarmSeverity: MAJOR - } - - BeConfigurationInvalidListSizeError: { - type: CONFIG_ERROR, - code: ASDC_3031, - severity: FATAL, - description: "Configuration parameter %s is invalid. At least %s values shall be configured", - alarmSeverity: MAJOR - } - - ErrorConfigFileFormat: { - type: CONFIG_ERROR, - code: ASDC_3032, - severity: ERROR, - description: "Error element not found in YAML name: %s", - alarmSeverity: MAJOR - } - - BeMissingArtifactInformationError: { - type: DATA_ERROR, - code: ASDC_4010, - severity: ERROR, - description: "Artifact uploaded has missing information. Missing %s", - alarmSeverity: MAJOR - } - - BeArtifactMissingError: { - type: DATA_ERROR, - code: ASDC_4011, - severity: ERROR, - description: "Artifact %s requested is not found", - alarmSeverity: MAJOR - } - - BeArtifactPayloadInvalid: { - type: DATA_ERROR, - code: ASDC_4012, - severity: ERROR, - description: "Payload of artifact uploaded is invalid (invalid MD5 or encryption)", - alarmSeverity: MAJOR - } - - BeUserMissingError: { - type: DATA_ERROR, - code: ASDC_4009, - severity: ERROR, - description: "User %s requested is not found", - alarmSeverity: MAJOR - } - - BeArtifactInformationInvalidError: { - type: DATA_ERROR, - code: ASDC_4013, - severity: ERROR, - description: "Input for artifact metadata is invalid", - alarmSeverity: MAJOR - } - BeFailedAddingCapabilityTypeError: { - type: DATA_ERROR, - code: ASDC_4015, - severity: ERROR, - description: "Failed adding capability type", - alarmSeverity: CRITICAL - } - - BeCapabilityTypeMissingError: { - type: DATA_ERROR, - code: ASDC_4016, - severity: ERROR, - description: "Capability Type %s not found", - alarmSeverity: CRITICAL - } - - BeInterfaceMissingError: { - type: DATA_ERROR, - code: ASDC_4020, - severity: ERROR, - description: "Interface %s required is missing", - alarmSeverity: MAJOR - } - - BeDaoSystemError: { - type: SYSTEM_ERROR, - code: ASDC_4014, - severity: ERROR, - description: "Operation towards database failed", - alarmSeverity: CRITICAL - } - - BeSystemError: { - type: SYSTEM_ERROR, - code: ASDC_4017, - severity: ERROR, - description: "Unexpected error during operation", - alarmSeverity: CRITICAL - } - - BeFailedLockObjectError: { - type: SYSTEM_ERROR, - code: ASDC_4007, - severity: WARN, - description: "Failed to lock object for update", - alarmSeverity: CRITICAL - } - - BeInvalidJsonInput: { - type: SYSTEM_ERROR, - code: ASDC_4018, - severity: ERROR, - description: "Failed to convert json input to object", - alarmSeverity: MAJOR - } - - BeDistributionMissingError: { - type: DATA_ERROR, - code: ASDC_4021, - severity: ERROR, - description: "Distribution %s required is missing", - alarmSeverity: MAJOR - } - - BeHealthCheckRecovery: { - type: RECOVERY, - code: ASDC_4022, - severity: INFO, - description: "BE Health Check Recovery", - alarmSeverity: INFORMATIONAL - } - BeFailedCreateNodeError: { - type: DATA_ERROR, - code: ASDC_6000, - severity: ERROR, - description: "Failed to create node %s on graph. status is %s", - alarmSeverity: MAJOR - } - BeFailedUpdateNodeError: { - type: DATA_ERROR, - code: ASDC_6001, - severity: ERROR, - description: "Failed to update node %s on graph. Status is %s", - alarmSeverity: MAJOR - } - - BeFailedDeleteNodeError: { - type: DATA_ERROR, - code: ASDC_6002, - severity: ERROR, - description: "Failed to delete node %s on graph. Status is %s", - alarmSeverity: MAJOR - } - - BeFailedRetrieveNodeError: { - type: DATA_ERROR, - code: ASDC_6003, - severity: ERROR, - description: "Failed to retrieve node %s from graph. Status is %s", - alarmSeverity: MAJOR - } - - BeExecuteRollbackError: { - type: DATA_ERROR, - code: ASDC_6004, - severity: ERROR, - description: "Going to execute rollback on graph.", - alarmSeverity: MAJOR - } - - BeFailedFindParentError: { - type: DATA_ERROR, - code: ASDC_6005, - severity: ERROR, - description: "Failed to find parent node %s on graph. Status is %s", - alarmSeverity: MAJOR - } - - BeFailedFindAllNodesError: { - type: DATA_ERROR, - code: ASDC_6006, - severity: ERROR, - description: "Failed to fetch all nodes with type %s of parent node %s . Status is %s", - alarmSeverity: MAJOR - } - - BeFailedFindAssociationError: { - type: DATA_ERROR, - code: ASDC_6007, - severity: ERROR, - description: "Cannot find node with type %s associated with node %s . Status is %s", - alarmSeverity: MAJOR - } - - BeFailedFindAssociationError: { - type: DATA_ERROR, - code: ASDC_6008, - severity: ERROR, - description: "Cannot find node with type %s associated with node %s . Status is %s", - alarmSeverity: MAJOR - } - BeComponentCleanerSystemError: { - type: SYSTEM_ERROR, - code: ASDC_6009, - severity: ERROR, - description: "Error occured in Component Cleaner Task. Failed operation: %s", - alarmSeverity: MAJOR - } - \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/config/test-apis-ci/error-configuration.yaml b/test-apis-ci/src/test/resources/config/test-apis-ci/error-configuration.yaml deleted file mode 100644 index 268c440222..0000000000 --- a/test-apis-ci/src/test/resources/config/test-apis-ci/error-configuration.yaml +++ /dev/null @@ -1,1883 +0,0 @@ -# Errors -errors: - OK: { - code: 200, - message: "OK" - } - CREATED: { - code: 201, - message: "OK" - } - ACCEPTED: { - code: 202, - message: "Accepted" - } - NO_CONTENT: { - code: 204, - message: "No Content" - } -#--------POL4050----------------------------- - NOT_ALLOWED: { - code: 405, - message: "Error: Method not allowed.", - messageId: "POL4050" - } -#--------POL5000----------------------------- - GENERAL_ERROR: { - code: 500, - message: "Error: Internal Server Error. Please try again later.", - messageId: "POL5000" - } -#---------POL5001------------------------------ - MISSING_X_ECOMP_INSTANCE_ID: { - code: 400 , - message: "Error: Missing 'X-ECOMP-InstanceID' HTTP header.", - messageId: "POL5001" - } -#---------POL5002------------------------------ - AUTH_REQUIRED: { - code: 401 , - message: "Error: Authentication is required to use the API.", - messageId: "POL5002" - } -#---------POL5003------------------------------ - AUTH_FAILED: { - code: 403 , - message: "Error: Not authorized to use the API.", - messageId: "POL5003" - } -#---------POL5004------------------------------ - MISSING_USER_ID: { - code: 400 , - message: "Error: Missing 'USER_ID' HTTP header.", - messageId: "POL5004" - } -#---------SVC4000----------------------------- - INVALID_CONTENT: { - code: 400, - message: "Error: Invalid content.", - messageId: "SVC4000" - } -#---------SVC4002----------------------------- - MISSING_INFORMATION: { - code: 403, - message: "Error: Missing information.", - messageId: "SVC4002" - } -#---------SVC4003------------------------------ -# %1 - Users's ID - USER_NOT_FOUND: { - code: 404, - message: "Error: User '%1' was not found.", - messageId: "SVC4003" - } -#---------SVC4004----------------------------- -# %1 - Users's email address - INVALID_EMAIL_ADDRESS: { - code: 400, - message: "Error: Invalid email address '%1'.", - messageId: "SVC4004" - } -#---------SVC4005------------------------------ -# %1 - role - INVALID_ROLE: { - code: 400, - message: "Error: Invalid role '%1'.", - messageId: "SVC4005" - } -#---------SVC4006------------------------------ -# %1 - Users's USER_ID - USER_ALREADY_EXIST: { - code: 409, - message: "Error: User with '%1' ID already exists.", - messageId: "SVC4006" - } -#---------SVC4007------------------------------ - DELETE_USER_ADMIN_CONFLICT: { - code: 409, - message: "Error: An administrator can only be deleted by another administrator.", - messageId: "SVC4007" - } -#---------SVC4008----------------------------- -# %1 - Users's userId - INVALID_USER_ID: { - code: 400, - message: "Error: Invalid userId '%1'.", - messageId: "SVC4008" - } - -#---------SVC4049------------------------------ -# %1 - service/resource - COMPONENT_MISSING_CONTACT: { - code: 400, - message: "Error: Invalid Content. Missing %1 contact.", - messageId: "SVC4051" - } -#---------SVC4050----------------------------- -# %1 - Service/Resource/Additional parameter -# %2 - service/resource/label name - COMPONENT_NAME_ALREADY_EXIST: { - code: 409, - message: "Error: %1 with name '%2' already exists.", - messageId: "SVC4050" - } -#---------SVC4051------------------------------ -# %1 - resource/service - COMPONENT_MISSING_CATEGORY: { - code: 400, - message: "Error: Invalid Content. Missing %1 category.", - messageId: "SVC4051" - } - -#---------SVC4052------------------------------ - COMPONENT_MISSING_TAGS: { - code: 400, - message: "Error: Invalid Content. At least one tag has to be specified.", - messageId: "SVC4052" - } - -#---------SVC4053------------------------------ -# %1 - service/resource - COMPONENT_MISSING_DESCRIPTION: { - code: 400, - message: "Error: Invalid Content. Missing %1 description.", - messageId: "SVC4053" - } -#---------SVC4054------------------------------ -# %1 - resource/service - COMPONENT_INVALID_CATEGORY: { - code: 400, - message: "Error: Invalid Content. Value %1 for the field Category is invalid.", - messageId: "SVC4054" - } -#---------SVC4055------------------------------ - MISSING_VENDOR_NAME: { - code: 400, - message: "Error: Invalid Content. Missing vendor name.", - messageId: "SVC4055" - } -#---------SVC4056------------------------------ - MISSING_VENDOR_RELEASE: { - code: 400, - message: "Error: Invalid Content. Missing vendor release.", - messageId: "SVC4056" - } - -#---------SVC4057------------------------------ - MISSING_DERIVED_FROM_TEMPLATE: { - code: 400, - message: "Error: Invalid Content. Missing derived from template specification.", - messageId: "SVC4057" - } - -#---------SVC4058------------------------------ -# %1 - service/resource - COMPONENT_MISSING_ICON: { - code: 400, - message: "Error: Invalid Content. Missing %1 icon.", - messageId: "SVC4058" - } -#---------SVC4059------------------------------ -# %1 - service/resource - COMPONENT_INVALID_ICON: { - code: 400, - message: "Error: Invalid Content. Invalid %1 icon.", - messageId: "SVC4059" - } -#---------SVC4060------------------------------ - PARENT_RESOURCE_NOT_FOUND: { - code: 400, - message: "Error: Invalid Content. Derived from resource template was not found.", - messageId: "SVC4060" - } -#---------SVC4061------------------------------ - MULTIPLE_PARENT_RESOURCE_FOUND: { - code: 400, - message: "Error: Invalid Content. Multiple derived from resource template is not allowed.", - messageId: "SVC4061" - } - -#---------SVC4062------------------------------ -# %1 - service/resource - MISSING_COMPONENT_NAME: { - code: 400, - message: "Error: Invalid Content. Missing %1 name.", - messageId: "SVC4062" - } -#---------SVC4063------------------------------ - #%1  -  resource/service name - RESOURCE_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' resource was not found.", - messageId: "SVC4063" - } - -#---------SVC4064------------------------------ -# %1 - Service/Resource/Property - COMPONENT_INVALID_DESCRIPTION: { - code: 400, - message: "Error: Invalid Content. %1 description contains non-english characters.", - messageId: "SVC4064" - } -#---------SVC4065------------------------------ -# %1 - Service/Resource/Property -# %2 - max resource/service name length - COMPONENT_DESCRIPTION_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. %1 description exceeds limit of %2 characters.", - messageId: "SVC4065" - } -#---------SVC4066------------------------------ -# %1 - max length - COMPONENT_TAGS_EXCEED_LIMIT: { - code: 400, - message: "Error: Invalid Content. Tags overall length exceeds limit of %1 characters.", - messageId: "SVC4066" - } -#---------SVC4067------------------------------ -# %1 - max length - VENDOR_NAME_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Vendor name exceeds limit of %1 characters.", - messageId: "SVC4067" - } -#---------SVC4068------------------------------ -# %1 - max length - VENDOR_RELEASE_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Vendor release exceeds limit of %1 characters.", - messageId: "SVC4068" - } - -#---------SVC4069------------------------------ -# %1 - Service/Resource/Product - COMPONENT_INVALID_CONTACT: { - code: 400, - message: "Error: Invalid Content. %1 Contact Id should be in format 'mnnnnnn' or 'aannna' or 'aannnn', where m=m ,a=a-zA-Z and n=0-9", - messageId: "SVC4069" - } -#---------SVC4070------------------------------ -# %1 - Service/Resource - INVALID_COMPONENT_NAME: { - code: 400, - message: 'Error: Invalid Content. Value %1 for Component name is invalid. Only alphanumeric characters and regular spaces are allowed.', - messageId: "SVC4070" - } - -#---------SVC4071------------------------------ - INVALID_VENDOR_NAME: { - code: 400, - message: 'Error: Invalid Content. Value %1 for the field Vendor name is invalid. Only alphanumeric characters and regular spaces are allowed.', - messageId: "SVC4071" - } -#---------SVC4072------------------------------ - INVALID_VENDOR_RELEASE: { - code: 400, - message: 'Error: Invalid Content. Value %1 for the field Vendor release is invalid. Only alphanumeric characters and regular spaces are allowed.', - messageId: "SVC4072" - } -#---------SVC4073------------------------------ -# %1 - Service/Resource -# %2 - max resource/service name - COMPONENT_NAME_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. %1 name exceeds limit of %2 characters.", - messageId: "SVC4073" - } -#---------SVC4080------------------------------ -# %1 - resource/service name -# %2 - resource/service -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_IN_CHECKOUT_STATE: { - code: 403, - message: "Error: Requested '%1' %2 is locked for modification by %3 %4(%5).", - messageId: "SVC4080" - } -#---------SVC4081----------------------------- -# %1 - resource/service name -# %2 - resource/service -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_IN_CERT_IN_PROGRESS_STATE: { - code: 403, - message: "Error: Requested '%1' %2 is locked for certification by %3 %4(%5).", - messageId: "SVC4081" - } - -#-----------SVC4082--------------------------- -# %1 - resource/service name -# %2 - resource/service -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_SENT_FOR_CERTIFICATION: { - code: 403, - message: "Error: Requested '%1' %2 is sent for certification by %3 %4(%5).", - messageId: "SVC4082" - } -#-----------SVC4083--------------------------- - COMPONENT_VERSION_ALREADY_EXIST: { - code: 409, - message: "Error: Version of this %1 was already promoted.", - messageId: "SVC4083" - } -#-----------SVC4084--------------------------- -# %1 - resource/service/product name -# %2 - resource/service/product -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_ALREADY_CHECKED_IN: { - code: 409, - message: "Error: The current version of '%1' %2 was already checked-in by %3 %4(%5).", - messageId: "SVC4084" - } -#-----------SVC4085--------------------------- -# %1 - resource/service/product name -# %2 - resource/service/product -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_CHECKOUT_BY_ANOTHER_USER: { - code: 403, - message: "Error: %1 %2 has already been checked out by %3 %4(%5).", - messageId: "SVC4085" - } -#-----------SVC4086--------------------------- -# %1  - resource/service name -# %2  - resource/service - COMPONENT_IN_USE: { - code: 403, - message: "Error: Requested '%1' %2 is in use by another user.", - messageId: "SVC4086" - } -#-----------SVC4087--------------------------- -# %1 - component name -# %2 - resource/service/product - COMPONENT_HAS_NEWER_VERSION: { - code: 409, - message: "Error: Checking out of the requested version of the '%1' %2 is not allowed as a newer version exists.", - messageId: "SVC4087" - } -#-----------SVC4088--------------------------- -# %1 - resource/service name -# %2 - resource/service -# %3 - First name of last modifier -# %4 - Last name of last modifier -# %5 - USER_ID of last modifier - COMPONENT_ALREADY_CERTIFIED: { - code: 403, - message: "Error: Requested %1 %2 has already been certified by %3 %4(%5).", - messageId: "SVC4088" - } -#-----------SVC4089--------------------------- -# %1 - resource/service name -# %2 - resource/service - COMPONENT_NOT_READY_FOR_CERTIFICATION: { - code: 403, - message: "Error: Requested '%1' %2 is not ready for certification.", - messageId: "SVC4089" - } -#-----------SVC4100--------------------------- -#%1 - property name - PROPERTY_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' property was not found.", - messageId: "SVC4100" - } -#-----------SVC4101--------------------------- -#%1 - property name - PROPERTY_ALREADY_EXIST: { - code: 409, - message: "Error: Property with '%1' name already exists.", - messageId: "SVC4101" - } - -#-----------SVC4102--------------------------- -# %1 - capability type name - CAPABILITY_TYPE_ALREADY_EXIST: { - code: 409, - message: "Error: Capability Type with name '%1' already exists.", - messageId: "SVC4102" - } -#-----------SVC4114--------------------------- - AUTH_FAILED_INVALIDE_HEADER: { - code: 400, - message: "Error: Invalid Authorization header.", - messageId: "SVC4114" - } -#-----------SVC4115--------------------------- -# %1 - capability type name - MISSING_CAPABILITY_TYPE: { - code: 400, - message: "Error: Invalid Content. Missing Capability Type '%1'.", - messageId: "SVC4115" - } - RESOURCE_INSTANCE_BAD_REQUEST: { - code: 400, - message: "Error: Invalid Content.", - messageId: "SVC4116" - } -#-----------SVC4117--------------------------- -# %1 - resource instance name -# %2 - resource instance name -# %3 - requirement name - RESOURCE_INSTANCE_MATCH_NOT_FOUND: { - code: 404, - message: "Error: Match not found between resource instance '%1' and resource instance '%2' for requirement '%3'.", - messageId: "SVC4117" - } -#-----------SVC4118--------------------------- -# %1 - resource instance name -# %2 - resource instance name -# %3 - requirement name - RESOURCE_INSTANCE_ALREADY_EXIST: { - code: 409, - message: "Error: Resource instances '%1' and '%2' are already associated with requirement '%3'.", - messageId: "SVC4118" - } -#-----------SVC4119--------------------------- -# %1 - resource instance name -# %2 - resource instance name -# %3 - requirement name - RESOURCE_INSTANCE_RELATION_NOT_FOUND: { - code: 404, - message: "Error: No relation found between resource instances '%1' and '%2' for requirement '%3'.", - messageId: "SVC4119" - } -#-----------SVC4120--------------------------- -# %1 - User's USER_ID - USER_INACTIVE: { - code: 404, - message: "Error: User %1 was not found.", - messageId: "SVC4120" - } -#-----------SVC4121--------------------------- -# %1 - User's USER_ID - USER_HAS_ACTIVE_ELEMENTS: { - code: 403, - message: "Error: User with %1 ID can not be deleted since it has active elements(resources/services/artifacts).", - messageId: "SVC4121" - } -#-----------SVC4122--------------------------- -# %1 - artifact type - ARTIFACT_TYPE_NOT_SUPPORTED: { - code: 400, - message: "Error: Invalid artifact type '%1'.", - messageId: "SVC4122" - } -#-----------SVC4123--------------------------- - ARTIFACT_LOGICAL_NAME_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Artifact logical name cannot be changed.", - messageId: "SVC4123" - } -#-----------SVC4124--------------------------- - MISSING_ARTIFACT_TYPE: { - code: 400, - message: "Error: Missing artifact type.", - messageId: "SVC4124" - } -#-----------SVC4125--------------------------- -# %1-artifact name - ARTIFACT_EXIST: { - code: 400, - message: "Error: Artifact '%1' already exists.", - messageId: "SVC4125" - } -#---------SVC4126------------------------------ -# %1 - resource/service/product/... -# %2 - field (tag, vendor name...) - INVALID_FIELD_FORMAT: { - code: 400, - message: "Error: Invalid %1 %2 format.", - messageId: "SVC4126" - } -#-----------SVC4127--------------------------- - ARTIFACT_INVALID_MD5: { - code: 400, - message: "Error: Invalid artifact checksum.", - messageId: "SVC4127" - } -#-----------SVC4128--------------------------- - MISSING_ARTIFACT_NAME: { - code: 400, - message: "Error: Invalid content. Missing artifact name.", - messageId: "SVC4128" - } -#-----------SVC4129--------------------------- - MISSING_PROJECT_CODE: { - code: 400, - message: "Error: Invalid Content. Missing PROJECT_CODE number.", - messageId: "SVC4129" - } -#-----------SVC4130--------------------------- - INVALID_PROJECT_CODE: { - code: 400, - message: "Error: Invalid Content. PROJECT_CODE must be from 3 up to 50 characters.", - messageId: "SVC4130" - } -#-----------SVC4131--------------------------- -# %1-resource/service -# %2-srtifact/artifacts -# %3-semicolomn separated list of artifact - COMPONENT_MISSING_MANDATORY_ARTIFACTS: { - code: 403, - message: "Error: Missing mandatory informational %1 %2: [%3].", - messageId: "SVC4131" - } -#-----------SVC4132--------------------------- -# %1 - lifecycle type name - LIFECYCLE_TYPE_ALREADY_EXIST: { - code: 409, - message: "Error: Lifecycle Type with name '%1' already exists.", - messageId: "SVC4132" - } -#-----------SVC4133--------------------------- -# %1 - service version -# %2 - service name - SERVICE_NOT_AVAILABLE_FOR_DISTRIBUTION: { - code: 403, - message: "Error: Version %1 of '%2' service is not available for distribution.", - messageId: "SVC4133" - } -#-----------SVC4134--------------------------- - MISSING_LIFECYCLE_TYPE: { - code: 400, - message: "Error: Invalid Content. Missing interface life-cycle type.", - messageId: "SVC4134" - } -#---------SVC4135------------------------------ - SERVICE_CATEGORY_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Service category cannot be changed once the service is certified.", - messageId: "SVC4135" - } -#---------SVC4136------------------------------ -# %1 - distribution environment name - DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE: { - code: 500, - message: "Error: Requested distribution environment '%1' is not available.", - messageId: "SVC4136" - } -#---------SVC4137------------------------------ -# %1 - distribution environment name - DISTRIBUTION_ENVIRONMENT_NOT_FOUND: { - code: 400, - message: "Error: Requested distribution environment '%1' was not found.", - messageId: "SVC4137" - } -#---------SVC4138------------------------------ - DISTRIBUTION_ENVIRONMENT_INVALID: { - code: 400, - message: "Error: Invalid distribution environment.", - messageId: "SVC4138" - } -#---------SVC4139------------------------------ -# %1 - service name - DISTRIBUTION_ARTIFACT_NOT_FOUND: { - code: 409, - message: "Error: Service '%1' cannot be distributed due to missing deployment artifacts.", - messageId: "SVC4139" - } -#---------SVC4200------------------------------ -# %1 - Service/Resource -# %2 - max icon name length - COMPONENT_ICON_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. %1 icon name exceeds limit of %2 characters.", - messageId: "SVC4200" - } -#---------SVC4300------------------------------ - RESTRICTED_ACCESS: { - code: 403, - message: "Error: Restricted access.", - messageId: "SVC4300" - } -#---------SVC4301------------------------------ - RESTRICTED_OPERATION: { - code: 409, - message: "Error: Restricted operation.", - messageId: "SVC4301" - } -#---------SVC4500------------------------------ - MISSING_BODY: { - code: 400 , - message: "Error: Missing request body.", - messageId: "SVC4500" - } -#---------SVC4501------------------------------ - MISSING_PUBLIC_KEY: { - code: 400 , - message: "Error: Invalid Content. Missing mandatory parameter 'apiPublicKey'." , - messageId: "SVC4501" - } -#---------SVC4502------------------------------ - DISTRIBUTION_ENV_DOES_NOT_EXIST: { - code: 400 , - message: "Error: Invalid Body : Missing mandatory parameter 'distrEnvName'." , - messageId: "SVC4502" - } -#-----------SVC4503--------------------------- -# %1 - service name - SERVICE_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' service was not found.", - messageId: "SVC4503" - } - -#---------SVC4504------------------------------ -# %1 - Service/Resource -# %2 - service/resource version - COMPONENT_VERSION_NOT_FOUND: { - code: 404, - message: "Error: %1 version %2 was not found.", - messageId: "SVC4504" - } -#-----------SVC4505--------------------------- - #%1-artifact name - - ARTIFACT_NOT_FOUND: { - code: 404, - message: "Error: Artifact '%1' was not found.", - messageId: "SVC4505" - } -#---------SVC4506------------------------------ - MISSING_ENV_NAME: { - code: 400 , - message: "Error: Invalid Content. Missing mandatory parameter 'distrEnvName'.", - messageId: "SVC4506" - } -#---------SVC4507------------------------------ - COMPONENT_INVALID_TAGS_NO_COMP_NAME: { - code: 400, - message: "Error: Invalid Content. One of the tags should be the component name.", - messageId: "SVC4507" - } - -#---------SVC4508------------------------------ - SERVICE_NAME_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Service name cannot be changed once the service is certified.", - messageId: "SVC4508" - } - -#---------SVC4509------------------------------ - SERVICE_ICON_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Icon cannot be changed once the service is certified.", - messageId: "SVC4509" - } -#---------SVC4510------------------------------ -# %1 - icon name max length - SERVICE_ICON_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Icon name exceeds limit of %1 characters.", - messageId: "SVC4510" - } -#---------SVC4511------------------------------ - DISTRIBUTION_REQUESTED_NOT_FOUND: { - code: 404, - message: "Error: Requested distribution was not found.", - messageId: "SVC4511" - } -#---------SVC4512------------------------------ -# %1 - Distribution ID - DISTRIBUTION_REQUESTED_FAILED: { - code: 403, - message: "Error: Requested distribution '%1' failed.", - messageId: "SVC4512" - } -#---------SVC4513------------------------------ - RESOURCE_CATEGORY_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Resource category cannot be changed once the resource is certified.", - messageId: "SVC4513" - } -#---------SVC4514------------------------------ - RESOURCE_NAME_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Resource name cannot be changed once the resource is certified.", - messageId: "SVC4514" - } -#---------SVC4515------------------------------ - RESOURCE_ICON_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Icon cannot be changed once the resource is certified.", - messageId: "SVC4515" - } -#---------SVC4516------------------------------ - RESOURCE_VENDOR_NAME_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Vendor name cannot be changed once the resource is certified.", - messageId: "SVC4516" - } -#---------SVC4517------------------------------ - RESOURCE_DERIVED_FROM_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: Derived from resource template cannot be changed once the resource is certified.", - messageId: "SVC4517" - } -#---------SVC4518------------------------------ -# %1 - max length - COMPONENT_SINGLE_TAG_EXCEED_LIMIT: { - code: 400, - message: "Error: Invalid Content. Single tag exceeds limit of %1 characters.", - messageId: "SVC4518" - } -#---------SVC4519------------------------------ - INVALID_DEFAULT_VALUE: { - code: 400, - message: "Error: mismatch in data-type occurred for property %1. data type is %2 and default value found is %3.", - messageId: "SVC4519" - } -#---------SVC4520------------------------------ -# %1 - service or resource - ADDITIONAL_INFORMATION_MAX_NUMBER_REACHED: { - code: 409, - message: "Error: Maximal number of additional %1 parameters was reached.", - messageId: "SVC4520" - } -#---------SVC4521------------------------------ - ADDITIONAL_INFORMATION_EMPTY_STRING_NOT_ALLOWED: { - code: 400, - message: "Error: Invalid Content. The Additional information label and value cannot be empty.", - messageId: "SVC4521" - } -#---------SVC4522------------------------------ -# %1 - label/value -# %2 - Maximal length of %1 - ADDITIONAL_INFORMATION_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Additional information %1 exceeds limit of %2 characters.", - messageId: "SVC4522" - } -#---------SVC4523------------------------------ - ADDITIONAL_INFORMATION_KEY_NOT_ALLOWED_CHARACTERS: { - code: 400, - message: 'Error: Invalid Content. Additional information label is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.', - messageId: "SVC4523" - } -#---------SVC4524------------------------------ - ADDITIONAL_INFORMATION_NOT_FOUND: { - code: 409, - message: "Error: Requested additional information was not found.", - messageId: "SVC4524" - } -#---------SVC4525------------------------------ - ADDITIONAL_INFORMATION_VALUE_NOT_ALLOWED_CHARACTERS: { - code: 400, - message: 'Error: Invalid Content. Additional information contains non-english characters.', - messageId: "SVC4525" - } -#---------SVC4526------------------------------ - RESOURCE_INSTANCE_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' resource instance was not found.", - messageId: "SVC4526" - } -#---------SVC4527------------------------------ - ASDC_VERSION_NOT_FOUND: { - code: 500, - message: 'Error: ASDC version cannot be displayed.', - messageId: "SVC4527" - } -#---------SVC4528------------------------------ -# %1-artifact url/artifact label/artifact description/VNF Service Indicator - MISSING_DATA: { - code: 400, - message: "Error: Invalid content. Missing %1.", - messageId: "SVC4528" - } -#---------SVC4529------------------------------ -# %1-artifact url/artifact label/artifact description/artifact name -# %2 - Maximal length of %1 - EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. %1 exceeds limit of %2 characters.", - messageId: "SVC4529" - } -#---------SVC4530------------------------------ - ARTIFACT_INVALID_TIMEOUT: { - code: 400, - message: "Error: Invalid Content. Artifact Timeout should be set to valid positive non-zero number of minutes.", - messageId: "SVC4530" - } -#---------SVC4531------------------------------ - SERVICE_IS_VNF_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: VNF Indicator cannot be updated for certified service.", - messageId: "SVC4531" - } - #---------SVC4532------------------------------ - RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE: { - code: 404, - message: "Error: Requested '%1' resource instance was not found on the service '%2.", - messageId: "SVC4532" - } - #---------SVC4533------------------------------ - # %1 - "HEAT"/"HEAT_ENV"/"MURANO_PKG"/"YANG_XML" - WRONG_ARTIFACT_FILE_EXTENSION: { - code: 400, - message: "Error: Invalid file extension for %1 artifact type.", - messageId: "SVC4533" - } - -#---------SVC4534------------------------------ -# %1 - "HEAT"/"HEAT_ENV" - INVALID_YAML: { - code: 400, - message: "Error: Uploaded YAML file for %1 artifact is invalid.", - messageId: "SVC4534" - } - -#---------SVC4535------------------------------ -# %1 - "HEAT" - INVALID_DEPLOYMENT_ARTIFACT_HEAT: { - code: 400, - message: "Error: Invalid %1 artifact.", - messageId: "SVC4535" - } -#---------SVC4536------------------------------ -# %1 - "Resource"/"Service" -# %2 - resource/service name -# %3 - "HEAT"/"HEAT_ENV"/"MURANO_PKG" -# %4 - "HEAT"/"HEAT_ENV"/"MURANO_PKG - DEPLOYMENT_ARTIFACT_OF_TYPE_ALREADY_EXISTS: { - code: 400, - message: "Error: %1 '%2' already has a deployment artifact of %3 type .Please delete or update an existing %4 artifact.", - messageId: "SVC4536" - } - -#---------SVC4537------------------------------ - MISSING_HEAT: { - code: 400, - message: "Error: Missing HEAT artifact. HEAT_ENV artifact cannot be uploaded without corresponding HEAT template.", - messageId: "SVC4537" - } -#---------SVC4538------------------------------ - MISMATCH_HEAT_VS_HEAT_ENV: { - code: 400, - message: "Error: Invalid artifact content. Parameter's set in HEAT_ENV '%1' artifact doesn't match the parameters in HEAT '%2' artifact.", - messageId: "SVC4538" - } -#---------SVC4539------------------------------ - INVALID_RESOURCE_PAYLOAD: { - code: 400, - message: "Error: Invalid resource payload.", - messageId: "SVC4539" - } -#---------SVC4540------------------------------ - INVALID_TOSCA_FILE_EXTENSION: { - code: 400, - message: "Error: Invalid file extension for TOSCA template.", - messageId: "SVC4540" - } -#---------SVC4541------------------------------ - INVALID_YAML_FILE: { - code: 400, - message: "Error: Invalid YAML file.", - messageId: "SVC4541" - } -#---------SVC4542------------------------------ - INVALID_TOSCA_TEMPLATE: { - code: 400, - message: "Error: Invalid TOSCA template.", - messageId: "SVC4542" - } -#---------SVC4543------------------------------ - NOT_RESOURCE_TOSCA_TEMPLATE: { - code: 400, - message: "Error: Imported Service TOSCA template.", - messageId: "SVC4543" - } -#---------SVC4544------------------------------ - NOT_SINGLE_RESOURCE: { - code: 400, - message: "Error: Imported TOSCA template should contain one resource definition.", - messageId: "SVC4544" - } -#---------SVC4545------------------------------ - INVALID_RESOURCE_NAMESPACE: { - code: 400, - message: "Error: Invalid resource namespace.", - messageId: "SVC4545" - } -#---------SVC4546------------------------------ - RESOURCE_ALREADY_EXISTS: { - code: 400, - message: "Error: Imported resource already exists in ASDC Catalog.", - messageId: "SVC4546" - } -#---------SVC4549------------------------------ - INVALID_RESOURCE_CHECKSUM: { - code: 400, - message: "Error: Invalid resource checksum.", - messageId: "SVC4549" - } -#---------SVC4550------------------------------ - #%1  -  Consumer salt - INVALID_LENGTH: { - code: 400, - message: "Error: Invalid %1 length.", - messageId: "SVC4550" - } - #---------SVC4551------------------------------ - #%1  -  ECOMP User name - ECOMP_USER_NOT_FOUND: { - code: 404, - message: "Error: ECOMP User '%1' was not found.", - messageId: "SVC4551" - } -#---------SVC4552------------------------------ - CONSUMER_ALREADY_EXISTS: { - code: 409, - message: "Error: ECOMP User already exists.", - messageId: "SVC4552" - } -#---------SVC4553----------------------------- - #%1  -  Consumer name / Consumer password/ Consumer salt - INVALID_CONTENT_PARAM: { - code: 400, - message: "Error: %1 is invalid.", - messageId: "SVC4553" - } - #---------SVC4554------------------------------ -# %1 - "Resource"/"Service" - COMPONENT_ARTIFACT_NOT_FOUND: { - code: 404, - message: "Error: Requested artifact doesn't belong to specified %1.", - messageId: "SVC4554" - } -#---------SVC4554------------------------------ -# %1 - "Service name" - SERVICE_DEPLOYMENT_ARTIFACT_NOT_FOUND: { - code: 403, - message: "Error: Requested '%1' service is not ready for certification. Service has to have at least one deployment artifact.", - messageId: "SVC4554" - } -#---------SVC4555------------------------------ -#%1 - "Resource"/"Service"/"Product" -#%2 - "category" - COMPONENT_ELEMENT_INVALID_NAME_LENGTH: { - code: 400, - message: "Error: Invalid %1 %2 name length.", - messageId: "SVC4555" - } -#---------SVC4556------------------------------ -#%1 - "Resource"/"Service"/"Product" -#%2 - "category" - COMPONENT_ELEMENT_INVALID_NAME_FORMAT: { - code: 400, - message: "Error: Invalid %1 %2 name format.", - messageId: "SVC4556" - } -#---------SVC4557------------------------------ -#%1 - "Resource"/"Service"/"Product" -#%2 - "category name" - COMPONENT_CATEGORY_ALREADY_EXISTS: { - code: 409, - message: "Error: %1 category name '%2' already exists.", - messageId: "SVC4557" - } -#---------SVC4558------------------------------ -# %1 - "service"/"VF" -# %2 - "Resource name" - VALIDATED_RESOURCE_NOT_FOUND: { - code: 403, - message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource.", - messageId: "SVC4558" - } -#---------SVC4559------------------------------ -# %1 - "service"/"VF" -# %2 - "Resource name" - FOUND_ALREADY_VALIDATED_RESOURCE: { - code: 403, - message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource. Please use already available validated resource version.", - messageId: "SVC4559" - } -#---------SVC4560------------------------------ -# %1 - "service"/"VF" -# %2 - "Resource name" - FOUND_LIST_VALIDATED_RESOURCES: { - code: 403, - message: "Error: Submit for Testing is not permitted as your '%1' includes non-validated '%2' resource. Please use one of available validated resource versions.", - messageId: "SVC4560" - } -#---------SVC4561------------------------------ -# %1 - "resource"/"product" -# %2 - "category" -# %3 - "category name" - COMPONENT_CATEGORY_NOT_FOUND: { - code: 404, - message: "Error: Requested %1 %2 '%3' was not found.", - messageId: "SVC4561" - } -#---------SVC4562------------------------------ -# %1 - "Resource"/"Product" -# %2 - "sub-category name" -# %3 - "category name" - COMPONENT_SUB_CATEGORY_EXISTS_FOR_CATEGORY: { - code: 409, - message: "Error: %1 sub-category '%2' already exists under '%3' category.", - messageId: "SVC4562" - } -#---------SVC4563------------------------------ -# %1 - "Product" -# %2 - "grouping name" -# %3 - "sub-category name" - COMPONENT_GROUPING_EXISTS_FOR_SUB_CATEGORY: { - code: 409, - message: "Error: %1 grouping '%2' already exists under '%3' sub-category.", - messageId: "SVC4563" - } -#---------SVC4564------------------------------ -# %1 - product name - PRODUCT_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' product was not found.", - messageId: "SVC4564" - } -#---------SVC4565------------------------------ -# %1 - "HEAT" -# %2 - parameter type ("string" , "boolean" , "number") -# %3 - parameter name - INVALID_HEAT_PARAMETER_VALUE: { - code: 400, - message: "Error: Invalid %1 artifact. Invalid %2 value set for '%3' parameter.", - messageId: "SVC4565" - } -#---------SVC4566------------------------------ -# %1 - "HEAT" -# %2 - parameter type ("string" , "boolean" , "number") - INVALID_HEAT_PARAMETER_TYPE: { - code: 400, - message: "Error: Invalid %1 artifact. Unsupported '%2' parameter type.", - messageId: "SVC4566" - } -#---------SVC4567------------------------------ -# %1 - "YANG_XML" - INVALID_XML: { - code: 400, - message: "Error: Uploaded XML file for %1 artifact is invalid.", - messageId: "SVC4567" - } -#---------SVC4567------------------------------ -# %1 - "User Name and UserId" -# %2 -"checked-out"/"in-certification" - CANNOT_DELETE_USER_WITH_ACTIVE_ELEMENTS: { - code: 409, - message: "Error: User cannot be deleted. User '%1' has %2 projects.", - messageId: "SVC4567" - } -#---------SVC4568------------------------------ -# %1 - "User Name and UserId" -# %2 -"checked-out"/"in-certification" - CANNOT_UPDATE_USER_WITH_ACTIVE_ELEMENTS: { - code: 409, - message: "Error: Role cannot be changed. User '%1' has %2 projects.", - messageId: "SVC4568" - } -#---------SVC4570------------------------------ - UPDATE_USER_ADMIN_CONFLICT: { - code: 409, - message: "Error: An administrator is not allowed to change his/her role.", - messageId: "SVC4570" - } -#---------SVC4571------------------------------ - SERVICE_CANNOT_CONTAIN_SUBCATEGORY: { - code: 400, - message: "Error: Sub category cannot be defined for service", - messageId: "SVC4571" - } -#---------SVC4572------------------------------ -# %1 - "Resource"/"Service" - COMPONENT_TOO_MUCH_CATEGORIES: { - code: 400, - message: "Error: %1 must have only 1 category", - messageId: "SVC4572" - } -#---------SVC4574------------------------------ - RESOURCE_TOO_MUCH_SUBCATEGORIES: { - code: 400, - message: "Error: Resource must have only 1 sub category", - messageId: "SVC4574" - } -#---------SVC4575------------------------------ - COMPONENT_MISSING_SUBCATEGORY: { - code: 400, - message: "Error: Missing sub category", - messageId: "SVC4575" - } - #---------SVC4576------------------------------ -# %1 - "component type" - UNSUPPORTED_ERROR: { - code: 400, - message: "Error : Requested component type %1 is unsupported.", - messageId: "SVC4576" - } - #---------SVC4577------------------------------ -# %1 - "resource type" - RESOURCE_CANNOT_CONTAIN_RESOURCE_INSTANCES: { - code: 409, - message: "Error : Resource of type %1 cannot contain resource instances.", - messageId: "SVC4577" - } -#---------SVC4578------------------------------ -# %1 - "Resource"/"Service" -# %2 - resource/service name -# %3 - "artifact name" - DEPLOYMENT_ARTIFACT_NAME_ALREADY_EXISTS: { - code: 400, - message: "Error: %1 '%2' already has a deployment artifact named '%3'.", - messageId: "SVC4578" - } -#---------SVC4579------------------------------ -# %1 - "Category"/"Sub-Category"/"Group" -# %2 - category/sub-category/grouping name. - INVALID_GROUP_ASSOCIATION: { - code: 400, - message: "Error: Invalid group association. %1 '%2' was not found.", - messageId: "SVC4579" - } -#---------SVC4580------------------------------ - EMPTY_PRODUCT_CONTACTS_LIST: { - code: 400, - message: "Error: Invalid content. At least one Product Contact has to be specified.", - messageId: "SVC4580" - } -#---------SVC4581------------------------------ -# %1 - UserId - INVALID_PRODUCT_CONTACT: { - code: 400, - message: "Error: Invalid content. User '%1' cannot be set as Product Contact.", - messageId: "SVC4581" - } -#---------SVC4582------------------------------ -# %1 - Product -# %2 - "abbreviated"/"full" - MISSING_ONE_OF_COMPONENT_NAMES: { - code: 400, - message: "Error: Invalid content. Missing %1 %2 name.", - messageId: "SVC4582" - } -#---------SVC4583------------------------------ -# %1 - "Icon" -# %2 - "resource"/"service"/"product" - COMPONENT_PARAMETER_CANNOT_BE_CHANGED: { - code: 400, - message: "Error: %1 cannot be changed once the %2 is certified.", - messageId: "SVC4583" - } -#---------SVC4584------------------------------ -# %1 - service/VF name -# %2 - "service" /"VF" -# %3 - resource instance origin type -# %4 - resource instance name -# %5 - requirement/capability -# %6 - requirement/capability name -# %7 - "fulfilled" (for req)/"consumed (for cap)" - REQ_CAP_NOT_SATISFIED_BEFORE_CERTIFICATION: { - code: 403, - message: "Error: Requested '%1' %2 is not ready for certification. %3 '%4' has to have %5 '%6' %7.", - messageId: "SVC4584" - } -#---------SVC4585------------------------------ - INVALID_OCCURRENCES: { - code: 400, - message: "Error: Invalid occurrences format.", - messageId: "SVC4585" - } -#---------SVC4586------------------------------ -#---------SVC4586------------------------------ - INVALID_SERVICE_API_URL: { - code: 400, - message: 'Error: Invalid Service API URL. Please check whether your URL has a valid domain extension and does not contain the following characters - #?&@%+;,=$<>~^`\[]{}|"*!', - messageId: "SVC4586" - } -#---------SVC4587------------------------------ -# %1 - Data type name - DATA_TYPE_ALREADY_EXIST: { - code: 409, - message: 'Error: Data type %1 already exists.', - messageId: "SVC4587" - } -#---------SVC4588------------------------------ -# %1 - Data type name - DATA_TYPE_NOR_PROPERTIES_NEITHER_DERIVED_FROM: { - code: 400, - message: 'Error: Invalid Data type %1. Data type must have either a valid derived from declaration or at least one valid property', - messageId: "SVC4588" - } -#---------SVC4589------------------------------ -# %1 - Data type name - DATA_TYPE_PROPERTIES_CANNOT_BE_EMPTY: { - code: 400, - message: "Error: Invalid Data type %1. 'properties' parameter cannot be empty if provided.", - messageId: "SVC4589" - } -#---------SVC4590------------------------------ -# %1 - Property type name -# %2 - Property name - INVALID_PROPERTY_TYPE: { - code: 400, - message: "Error: Invalid Property type %1 in property %2.", - messageId: "SVC4590" - } -#---------SVC4591------------------------------ -# %1 - Property inner type -# %2 - Property name - INVALID_PROPERTY_INNER_TYPE: { - code: 400, - message: "Error: Invalid property inner type %1, in property %2", - messageId: "SVC4591" - } -#---------SVC4592------------------------------ -# %1 - component instance name -# %2 - "resource instance"/"service instance" - COMPONENT_INSTANCE_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' %2 was not found.", - messageId: "SVC4592" - } -#---------SVC4593------------------------------ -# %1 - component instance name -# %2 - "resource instance"/"service instance" -# %3 - "resource/"service"/"product" -# %4 - container name - COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER: { - code: 404, - message: "Error: Requested '%1' %2 was not found on the %3 '%4'.", - messageId: "SVC4593" - } -#---------SVC4594------------------------------ -#%1 - requirement / capability -#%2 - requirement name - IMPORT_DUPLICATE_REQ_CAP_NAME: { - code: 400, - message: "Error: Imported TOSCA template contains more than one %1 named '%2'.", - messageId: "SVC4594" - } -#---------SVC4595------------------------------ -#%1 - requirement / capability -#%2 - requirement name -#%3 - parent containing the requirement - IMPORT_REQ_CAP_NAME_EXISTS_IN_DERIVED: { - code: 400, - message: "Error: Imported TOSCA template contains %1 '%2' that is already defined by derived template %3.", - messageId: "SVC4595" - } -#---------SVC4596------------------------------ -# %1 - Data type name - DATA_TYPE_DERIVED_IS_MISSING: { - code: 400, - message: "Error: Invalid Content. The ancestor data type %1 cannot be found in the system.", - messageId: "SVC4596" - } -#---------SVC4597------------------------------ -# %1 - Data type name -# %2 - Property names - DATA_TYPE_PROPERTY_ALREADY_DEFINED_IN_ANCESTOR: { - code: 400, - message: "Error: Invalid Content. The data type %1 contains properties named %2 which are already defined in one of its ancestors.", - messageId: "SVC4597" - } -#---------SVC4598------------------------------ -# %1 - Data type name - DATA_TYPE_DUPLICATE_PROPERTY: { - code: 400, - message: "Error: Invalid Content. The data type %1 contains duplicate property.", - messageId: "SVC4598" - } -#---------SVC4599------------------------------ -# %1 - Data type name -# %2 - Property names - DATA_TYPE_PROEPRTY_CANNOT_HAVE_SAME_TYPE_OF_DATA_TYPE: { - code: 400, - message: "Error: Invalid Content. The data type %1 contains properties %2 which their type is this data type.", - messageId: "SVC4599" - } -#---------SVC4600------------------------------ -# %1 - Data type name - DATA_TYPE_CANNOT_HAVE_PROPERTIES: { - code: 400, - message: "Error: Invalid Content. The data type %1 cannot have properties since it is of type scalar", - messageId: "SVC4600" - } -#---------SVC4601------------------------------ - NOT_TOPOLOGY_TOSCA_TEMPLATE: { - code: 400, - message: "Error: TOSCA yaml file %1 cannot be modeled to VF as it does not contain 'topology_template.", - messageId: "SVC4601" - } -#---------SVC4602-------------------------------- -# %1 - yaml file name -# %2 - node_template label -# %3 - node_template type - INVALID_NODE_TEMPLATE: { - code: 400, - message: "Error: TOSCA yaml file '%1' contains node_template '%2' of type '%3' that does not represent existing VFC/CP/VL", - messageId: "SVC4602" - } -#---------SVC4603------------------------------ -# %1 - component type -# %2 - component name -# %3 - state - ILLEGAL_COMPONENT_STATE: { - code: 403, - message: "Error: Component instance of %1 can not be created because the component '%2' is in an illegal state %3.", - messageId: "SVC4603" - } -#---------SVC4604------------------------------ -# %1 - csar file name - CSAR_INVALID: { - code: 400, - message: "Error: TOSCA CSAR '%1' is invalid. 'TOSCA-Metadata/Tosca.meta' file must be provided.", - messageId: "SVC4604" - } -#---------SVC4605------------------------------ -# %1 - csar file name - CSAR_INVALID_FORMAT: { - code: 400, - message: "Error: TOSCA CSAR '%1' is invalid. Invalid 'TOSCA-Metadata/Tosca.meta' file format.", - messageId: "SVC4605" - } -#---------SVC4606------------------------------ -# %1 - property name -# %2 - property type -# %3 - property innerType -# %4 - default value is - INVALID_COMPLEX_DEFAULT_VALUE: { - code: 400, - message: "Error: Invalid default value of property %1. Data type is %2 with inner type %3 and default value found is %4.", - messageId: "SVC4606" - } -#---------SVC4607------------------------------ -# %1 - csar file name - CSAR_NOT_FOUND: { - code: 400, - message: "Error: TOSCA CSAR '%1' is not found.", - messageId: "SVC4607" - } -#---------SVC4608------------------------------ -# %1 - artifact name -# %2 - component type -# %3 - actual component type - MISMATCH_BETWEEN_ARTIFACT_TYPE_AND_COMPONENT_TYPE: { - code: 400, - message: "Error: Artifact %1 is only compatible with component of type %2, but component type is %3.", - messageId: "SVC4608" - } - -#---------SVC4609------------------------------ -# %1 - "INVALID_JSON" - INVALID_JSON: { - code: 400, - message: "Error: Uploaded JSON file for %1 artifact is invalid.", - messageId: "SVC4609" - } -#---------SVC4610------------------------------ -# %1 - csar file name -# %2 - missing file name - YAML_NOT_FOUND_IN_CSAR: { - code: 400, - message: "Error - TOSCA CSAR %1 is invalid. TOSCA-Metadata/Tosca.meta refers to file %2 that is not provided.", - messageId: "SVC4610" - } -#---------SVC4611------------------------------ -# %1 - group name - GROUP_MEMBER_EMPTY: { - code: 400, - message: "Error: Invalid Content. Group %1 member list was provided but does not have values", - messageId: "SVC4611" - } -#---------SVC4612------------------------------ -# %1 - group name - GROUP_TYPE_ALREADY_EXIST: { - code: 409, - message: 'Error: Group type %1 already exists.', - messageId: "SVC4612" - } -#---------SVC4613------------------------------ -# %1 - group name -# %2 - VF name(component name) -# %3 - actual component type [VF] - GROUP_ALREADY_EXIST: { - code: 409, - message: "Error: Group with name '%1' already exists in %2 %3.", - messageId: "SVC4613" - } -#---------SVC4614------------------------------ -# %1 - group type - GROUP_TYPE_IS_INVALID: { - code: 400, - message: "Error: Invalid content. Group type %1 does not exist", - messageId: "SVC4614" - } -#---------SVC4615------------------------------ -# %1 - group name - GROUP_MISSING_GROUP_TYPE: { - code: 400, - message: "Error: Invalid Content. Missing Group Type for group '%1'", - messageId: "SVC4615" - } -#---------SVC4616------------------------------ -# %1 - member name -# %2 - group name -# %3 - VF name -# %4 - component type [VF ] - GROUP_INVALID_COMPONENT_INSTANCE: { - code: 400, - message: "Error: Member '%1' listed in group '%2' is not part of '%3' %4.", - messageId: "SVC4616" - } -#---------SVC4617------------------------------ -# %1 - member name -# %2 - group name -# %3 - group type - GROUP_INVALID_TOSCA_NAME_OF_COMPONENT_INSTANCE: { - code: 400, - message: "Error: member %1 listed in group %2 is not part of allowed members of group type %3.", - messageId: "SVC4617" - } -#---------SVC4618------------------------------ -# %1 - missing file name -# %2 - csar file name - ARTIFACT_NOT_FOUND_IN_CSAR: { - code: 400, - message: "Error: artifact %1 is defined in CSAR %2 manifest but is not provided", - messageId: "SVC4618" - } -#---------SVC4619------------------------------ -# %1 - artifact name -# %2 - artifact type -# %3 - existing artifact type - ARTIFACT_ALREADY_EXIST_IN_DIFFERENT_TYPE_IN_CSAR: { - code: 400, - message: "Error: artifact %1 in type %2 already exists in type %3.", - messageId: "SVC4619" - } -#---------SVC4620------------------------------ - FAILED_RETRIVE_ARTIFACTS_TYPES: { - code: 400, - message: "Error: Failed to retrieve list of suported artifact types.", - messageId: "SVC4620" - } -#---------SVC4621------------------------------ -# %1 - artifact name -# %2 - master - ARTIFACT_ALRADY_EXIST_IN_MASTER_IN_CSAR: { - code: 400, - message: "Error: artifact %1 already exists in master %2 .", - messageId: "SVC4621" - } -#---------SVC4622------------------------------ -# %1 - artifact name -# %2 - artifact type -# %3 - master name -# %4 - master type - ARTIFACT_NOT_VALID_IN_MASTER: { - code: 400, - message: "Error: artifact %1 in type %2 can not be exists under master %3 in type %4.", - messageId: "SVC4622" - } -#---------SVC4623------------------------------ -# %1 - artifact name -# %2 - artifact type -# %3 - env name -# %4 - existing env - ARTIFACT_NOT_VALID_ENV: { - code: 400, - message: "Error: Artifact %1 in type %2 with env %3 already exists with another env %4", - messageId: "SVC4623" - } -#---------SVC4624------------------------------ -# %1 - groups names -# %2 - VF name -# %3 - component type [VF ] - GROUP_IS_MISSING: { - code: 400, - message: "Error: Invalid Content. The groups '%1' cannot be found under %2 %3.", - messageId: "SVC4624" - } -#---------SVC4625------------------------------ -# %1 - groups name - GROUP_ARTIFACT_ALREADY_ASSOCIATED: { - code: 400, - message: "Error: Invalid Content. Artifact already associated to group '%1'.", - messageId: "SVC4625" - } -#---------SVC4626------------------------------ -# %1 - groups name - GROUP_ARTIFACT_ALREADY_DISSOCIATED: { - code: 400, - message: "Error: Invalid Content. Artifact already dissociated from group '%1'.", - messageId: "SVC4626" - } -#---------SVC4627------------------------------ -# %1 - property name -# %2 - group name -# %3 - group type name - GROUP_PROPERTY_NOT_FOUND: { - code: 400, - message: "Error: property %1 listed in group %2 is not exist in group type %3.", - messageId: "SVC4627" - } -#---------SVC4628------------------------------ -# %1 - csarUUID -# %2 - VF name - VSP_ALREADY_EXISTS: { - code: 400, - message: "Error: The VSP with UUID %1 was already imported for VF %2. Please select another or update the existing VF.", - messageId: "SVC4628" - } -#---------SVC4629------------------------------ -# %1 - VF name - MISSING_CSAR_UUID: { - code: 400, - message: "Error: The Csar UUID or payload name is missing for VF %1.", - messageId: "SVC4629" - } -#---------SVC4630------------------------------ -# %1 - VF name -# %2 - new csarUUID -# %3 - old csarUUID - RESOURCE_LINKED_TO_DIFFERENT_VSP: { - code: 400, - message: "Error: Resource %1 cannot be updated using CsarUUID %2 since the resource is linked to a different VSP with csarUUID %3.", - messageId: "SVC4630" - } -#---------SVC4631------------------------------ -# %1 - policy name - POLICY_TYPE_ALREADY_EXIST: { - code: 409, - message: "Error: Policy type %1 already exists.", - messageId: "SVC4631" - } -#---------SVC4632------------------------------ -# %1 - target name -# %2 - policy type name - TARGETS_NON_VALID: { - code: 400, - message: "Error: target %1 listed in policy type %2 is not a group or resource.", - messageId: "SVC4632" - } -#---------SVC4633------------------------------ -# %1 - policy name - TARGETS_EMPTY: { - code: 400, - message: "Error: Invalid Content. Policy %1 target list was provided but does not have values", - messageId: "SVC4633" - } -#---------SVC4634------------------------------ - DATA_TYPE_CANNOT_BE_EMPTY: { - code: 500, - message: "Error: Data types are empty. Please import the data types.", - messageId: "SVC4634" - } -#---------SVC4635------------------------------ -# %1 - csar uuid - RESOURCE_FROM_CSAR_NOT_FOUND: { - code: 400, - message: "Error: resource from csar uuid %1 not found", - messageId: "SVC4635" - } -#---------SVC4636------------------------------ -# %1 - Data type name - DATA_TYPE_CANNOT_BE_UPDATED_BAD_REQUEST: { - code: 400, - message: 'Error: Data type %1 cannot be upgraded. The new data type does not contain old properties or the type of one of the properties has been changed.', - messageId: "SVC4636" - } -#-----------SVC4637--------------------------- -#%1 - attribute name - ATTRIBUTE_NOT_FOUND: { - code: 404, - message: "Error: Requested '%1' attribute was not found.", - messageId: "SVC4637" - } -#-----------SVC4638--------------------------- -#%1 - attribute name - ATTRIBUTE_ALREADY_EXIST: { - code: 409, - message: "Error: Attribute with '%1' name already exists.", - messageId: "SVC4638" - } -#-----------SVC4639--------------------------- -#%1 - property name - PROPERTY_NAME_ALREADY_EXISTS: { - code: 409, - message: "Error: Property with '%1' name and different type already exists.", - messageId: "SVC4639" - } -#-----------SVC4640--------------------------- -#%1 - property name - INVALID_PROPERTY: { - code: 409, - message: "Error: Invalid property received.", - messageId: "SVC4640" - } -#---------SVC4641----------------------------- -#%1 - invalid filter -#%2 - valid filters - INVALID_FILTER_KEY: { - code: 400, - message: "Error: The filter %1 is not applicable. Please use one of the following filters: %2", - messageId: "SVC4641" - } -#---------SVC4642----------------------------- -#%1 - asset type -#%2 - filter - NO_ASSETS_FOUND: { - code: 404, - message: "No %1 were found to match criteria %2", - messageId: "SVC4642" - } -#---------SVC4643------------------------------ -# %1 - "Resource"/"Product" -# %2 - "sub-category name" -# %3 - "category name" - COMPONENT_SUB_CATEGORY_NOT_FOUND_FOR_CATEGORY: { - code: 404, - message: "Error: %1 sub-category '%2' not found under category '%3'.", - messageId: "SVC4643" - } -#---------SVC4644------------------------------ -# %1 - Format - CORRUPTED_FORMAT: { - code: 400, - message: "Error: %1 format is corrupted.", - messageId: "SVC4644" - } -#---------SVC4645------------------------------ -# %1 - "groupType" - INVALID_VF_MODULE_TYPE: { - code: 400, - message: "Error: Invalid group type '%1' (should be VfModule).", - messageId: "SVC4645" - } -#---------SVC4646------------------------------ -# %1 - "groupName" - INVALID_VF_MODULE_NAME: { - code: 400, - message: "Error: Invalid Content. VF Module name '%1' contains invalid characters", - messageId: "SVC4646" - } - -#---------SVC4647------------------------------ -# %1 - "modifiedName" - INVALID_VF_MODULE_NAME_MODIFICATION: { - code: 400, - message: "Error: Invalid VF Module name modification, can not modify '%1'", - messageId: "SVC4647" - } -#---------SVC4648------------------------------ -# %1 - "inputId" -# %2 - "componentId" - INPUT_IS_NOT_CHILD_OF_COMPONENT: { - code: 400, - message: "Error: Input id: '%1' is not child of component id: '%2'", - messageId: "SVC4648" - } -#---------SVC4649------------------------------ -# %1 - "groupName" - GROUP_HAS_CYCLIC_DEPENDENCY: { - code: 400, - message: "Error: The group '%1' has cyclic dependency", - messageId: "SVC4649" - } -#---------SVC4650------------------------------ -# %1 - "Component Type" -# %2 - -# %3 - error description - AAI_ARTIFACT_GENERATION_FAILED: { - code: 500, - message: "Error: %1 %2 automatic generation of artifacts failed. Description: %3", - messageId: "SVC4650" - } -#---------SVC4651------------------------------ - PARENT_RESOURCE_DOES_NOT_EXTEND: { - code: 400, - message: "Error: Once resource is certified, derived_from can be changed only to a sibling", - messageId: "SVC4651" - } -#---------SVC4652------------------------------ -# %1 - resource/service - COMPONENT_INVALID_SUBCATEGORY: { - code: 400, - message: "Error: Invalid Content. Invalid %1 sub category.", - messageId: "SVC4652" - } -#---------SVC4653------------------------------ -# %1 - group instance uniqueId -# %2 - service uniqueId - GROUP_INSTANCE_NOT_FOUND_ON_COMPONENT_INSTANCE: { - code: 404, - message: "Error: Requested group instance %1 was not found on component %2.", - messageId: "SVC4653" - } -#---------SVC4654------------------------------ -# %1 - group property name -# %2 - valid min limit value -# %3 - valid max limit value - INVALID_GROUP_MIN_MAX_INSTANCES_PROPERTY_VALUE: { - code: 400, - message: "Error: Value of %1 must be not higher than %2, and not lower than %3.", - messageId: "SVC4654" - } -#---------SVC4655------------------------------ -# %1 - group property name -# %2 - valid min limit value -# %3 - valid max limit value - INVALID_GROUP_INITIAL_COUNT_PROPERTY_VALUE: { - code: 400, - message: "Error: Value of %1 must be between %2 and %3.", - messageId: "SVC4655" - } -#---------SVC4656------------------------------ -# %1 - group property name -# %2 - lower/higher -# %3 - valid max/min value - INVALID_GROUP_PROPERTY_VALUE_LOWER_HIGHER: { - code: 400, - message: "Error: Value of %1 must be %2 or equals to %3.", - messageId: "SVC4656" - } -#---------SVC4657------------------------------ -# %1 - certificationRequest / startTesting - RESOURCE_VFCMT_LIFECYCLE_STATE_NOT_VALID: { - code: 400, - message: "Error - Lifecycle state %1 is not valid for resource of type VFCMT", - messageId: "SVC4657" - } -#---------SVC4658------------------------------ -# %1 – asset type [service / resource ] -# %2 – main asset uuid -# %3 – not found asset type [service / resource] -# %4 – not found asset name - ASSET_NOT_FOUND_DURING_CSAR_CREATION: { - code: 400, - message: "Error: CSAR packaging failed for %1 %2. %3 %4 was not found", - messageId: "SVC4658" - } -#---------SVC4659------------------------------ -# %1 – asset type [service / resource ] -# %2 – main asset uuid -# %3 – Artifact name -# %4 – Artifact uuid - ARTIFACT_PAYLOAD_NOT_FOUND_DURING_CSAR_CREATION: { - code: 400, - message: "Error: CSAR packaging failed for %1 %2. Artifact %3 [%4] was not found", - messageId: "SVC4659" - } -#---------SVC4660------------------------------ -# %1 - assetType -# %2 - matching generic node type name - GENERIC_TYPE_NOT_FOUND: { - code: 404, - message: "Creation of %1 failed. Generic type %2 was not found", - messageId: "SVC4660" - } -#---------SVC4661------------------------------ -# %1 - assetType -# %2 - matching generic node type name - TOSCA_SCHEMA_FILES_NOT_FOUND: { - code: 400, - message: "Error: CSAR packaging failed. TOSCA schema files for SDC-Version: %1 and Conformance-Level %2 were not found", - messageId: "SVC4661" - } -#---------SVC4662------------------------------ -# %1 - file name -# %2 - parser error - TOSCA_PARSE_ERROR: { - code: 400, - message: "Error: Invalid TOSCA template in file %1. %2", - messageId: "SVC4662" - } -#---------SVC4663------------------------------ -# %1 - max length - RESOURCE_VENDOR_MODEL_NUMBER_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Resource vendor model number exceeds limit of %1 characters.", - messageId: "SVC4663" - } -#---------SVC4664------------------------------ - INVALID_RESOURCE_VENDOR_MODEL_NUMBER: { - code: 400, - message: 'Error: Invalid Content. Resource vendor model number is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.', - messageId: "SVC4664" - } -#---------SVC4665------------------------------ -# %1 - max length - SERVICE_TYPE_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Service type exceeds limit of %1 characters.", - messageId: "SVC4665" - } -#---------SVC4666------------------------------ - INVALID_SERVICE_TYPE: { - code: 400, - message: 'Error: Invalid Content. Serivce type is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.', - messageId: "SVC4666" - } -#---------SVC4667------------------------------ -# %1 - max length - SERVICE_ROLE_EXCEEDS_LIMIT: { - code: 400, - message: "Error: Invalid Content. Service role exceeds limit of %1 characters.", - messageId: "SVC4667" - } -#---------SVC4668------------------------------ - INVALID_SERVICE_ROLE: { - code: 400, - message: 'Error: Invalid Content. Service role is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.', - messageId: "SVC4668" - } - -#---------SVC4669----------------------------- - INVALID_RESOURCE_TYPE: { - code: 400, - message: "Error: Invalid resource type.", - messageId: "SVC4669" - } -#---------SVC4670------------------------------ - ARTIFACT_NAME_INVALID: { - code: 400, - message: "Error: Artifact name is invalid.", - messageId: "SVC4670" - } -#---------SVC4671------------------------------ -# %1 - VSP name -# %2 - VFC name - CFVC_LOOP_DETECTED: { - code: 400, - message: 'Error: VSP %1 cannot be imported. The VSP contains internal loop in VFC %2', - messageId: "SVC4671" - } -#---------SVC4672------------------------------ -# %1 - capability uniqueId -# %2 - instance uniqueId -# %3 - container uniqueId - COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER: { - code: 404, - message: "Error: Requested capability %1 of instance %2 was not found on the container %3.", - messageId: "SVC4672" - } - - -#---------SVC4673------------------------------ - INVALID_SERVICE_STATE: { - code: 409, - message: "Error: Invalid service state. Expected state: %1, actual state: %2", - messageId: "SVC4673" - } - -#---------SVC4674------------------------------ - INVALID_RESPONSE_FROM_PROXY: { - code: 502, - message: "Error: The server was acting as a gateway or proxy and received an invalid response from the upstream server", - messageId: "SVC4674" - } \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/config/test-apis-ci/neo4j-errors-configuration.yaml b/test-apis-ci/src/test/resources/config/test-apis-ci/neo4j-errors-configuration.yaml deleted file mode 100644 index 7a0d6dbfd4..0000000000 --- a/test-apis-ci/src/test/resources/config/test-apis-ci/neo4j-errors-configuration.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# Errors -errors: - Neo_ClientError_General_ReadOnly: "This is a read only database, writing or modifying the database is not allowed." - Neo_ClientError_LegacyIndex_NoSuchIndex: "The request (directly or indirectly) referred to a index that does not exist." - Neo_ClientError_Request_Invalid: "The client provided an invalid Request." - Neo_ClientError_Request_InvalidFormat: "The client provided a request that was missing required fields, or had values that are not allowed." - Neo_ClientError_Schema_ConstraintAlreadyExists: "Unable to perform operation because it would clash with a pre-existing constraint." - Neo_ClientError_Schema_ConstraintVerificationFailure: "Unable to create constraint because data that exists in the database violates it." - Neo_ClientError_Schema_ConstraintViolation: "A constraint imposed by the database was violated." - Neo_ClientError_Schema_IllegalTokenName: "A token name, such as a label, relationship type or property key, used is not valid. Tokens cannot be empty strings and cannot be null." - Neo_ClientError_Schema_IndexAlreadyExists: "Unable to perform operation because it would clash with a pre-existing index." - Neo_ClientError_Schema_IndexBelongsToConstraint: "A requested operation can not be performed on the specified index because the index is part of a constraint. If you want to drop the index, for instance, you must drop the constraint." - Neo_ClientError_Schema_IndexLimitReached: "The maximum number of index entries supported has been reached, no more entities can be indexed." - Neo_ClientError_Schema_LabelLimitReached: "The maximum number of labels supported has been reached, no more labels can be created." - Neo_ClientError_Schema_NoSuchConstraint: "The request (directly or indirectly) referred to a constraint that does not exist." - Neo_ClientError_Schema_NoSuchIndex: "The request (directly or indirectly) referred to an index that does not exist." - Neo_ClientError_Security_AuthenticationFailed: "The client provided an incorrect username and/or password." - Neo_ClientError_Security_AuthenticationRateLimit: "The client has provided incorrect authentication details too many times in a row." - Neo_ClientError_Security_AuthorizationFailed: "The client does not have privileges to perform the operation requested." - Neo_ClientError_Statement_ArithmeticError: "Invalid use of arithmetic, such as dividing by zero." - Neo_ClientError_Statement_ConstraintViolation: "A constraint imposed by the statement is violated by the data in the database." - Neo_ClientError_Statement_EntityNotFound: "The statement is directly referring to an entity that does not exist." - Neo_ClientError_Statement_InvalidArguments: "The statement is attempting to perform operations using invalid arguments" - Neo_ClientError_Statement_InvalidSemantics: "The statement is syntactically valid, but expresses something that the database cannot do." - Neo_ClientError_Statement_InvalidSyntax: "The statement contains invalid or unsupported syntax." - Neo_ClientError_Statement_InvalidType: "The statement is attempting to perform operations on values with types that are not supported by the operation." - Neo_ClientError_Statement_NoSuchLabel: "The statement is referring to a label that does not exist." - Neo_ClientError_Statement_NoSuchProperty: "The statement is referring to a property that does not exist." - Neo_ClientError_Statement_ParameterMissing: "The statement is referring to a parameter that was not provided in the Request." - Neo_ClientError_Transaction_ConcurrentRequest: "There were concurrent requests accessing the same transaction, which is not allowed." - Neo_ClientError_Transaction_EventHandlerThrewException: "A transaction event handler threw an exception. The transaction will be rolled back." - Neo_ClientError_Transaction_HookFailed: "Transaction hook failure." - Neo_ClientError_Transaction_InvalidType: "The transaction is of the wrong type to service the Request_ For instance, a transaction that has had schema modifications performed in it cannot be used to subsequently perform data operations, and vice versa." - Neo_ClientError_Transaction_MarkedAsFailed: "Transaction was marked as both successful and failed. Failure takes precedence and so this transaction was rolled back although it may have looked like it was going to be committed" - Neo_ClientError_Transaction_UnknownId: "The request referred to a transaction that does not exist." - Neo_ClientError_Transaction_ValidationFailed: "Transaction changes did not pass validation checks" - Neo_DatabaseError_General_CorruptSchemaRule: "A malformed schema rule was encountered. Please contact your support representative." - Neo_DatabaseError_General_FailedIndex: "The request (directly or indirectly) referred to an index that is in a failed state. The index needs to be dropped and recreated manually." - Neo_DatabaseError_General_UnknownFailure: "An unknown failure occurred." - Neo_DatabaseError_Schema_ConstraintCreationFailure: "Creating a requested constraint failed." - Neo_DatabaseError_Schema_ConstraintDropFailure: "The database failed to drop a requested constraint." - Neo_DatabaseError_Schema_IndexCreationFailure: "Failed to create an index." - Neo_DatabaseError_Schema_IndexDropFailure: "The database failed to drop a requested index." - Neo_DatabaseError_Schema_NoSuchLabel: "The request accessed a label that did not exist." - Neo_DatabaseError_Schema_NoSuchPropertyKey: "The request accessed a property that does not exist." - Neo_DatabaseError_Schema_NoSuchRelationshipType: "The request accessed a relationship type that does not exist." - Neo_DatabaseError_Schema_NoSuchSchemaRule: "The request referred to a schema rule that does not exist." - Neo_DatabaseError_Statement_ExecutionFailure: "The database was unable to execute the Statement." - Neo_DatabaseError_Transaction_CouldNotBegin: "The database was unable to start the Transaction." - Neo_DatabaseError_Transaction_CouldNotCommit: "The database was unable to commit the Transaction." - Neo_DatabaseError_Transaction_CouldNotRollback: "The database was unable to roll back the Transaction." - Neo_DatabaseError_Transaction_CouldNotWriteToLog: "The database was unable to write transaction to log." - Neo_DatabaseError_Transaction_ReleaseLocksFailed: "The transaction was unable to release one or more of its locks." - Neo_TransientError_General_DatabaseUnavailable: "The database is not currently available to serve your request, refer to the database logs for more details. Retrying your request at a later time may succeed." - Neo_TransientError_Network_UnknownFailure: "An unknown network failure occurred, a retry may resolve the issue." - Neo_TransientError_Schema_ModifiedConcurrently: "The database schema was modified while this transaction was running, the transaction should be retried." - Neo_TransientError_Security_ModifiedConcurrently: "The user was modified concurrently to this Request." - Neo_TransientError_Statement_ExternalResourceFailure: "The external resource is not available" - Neo_TransientError_Transaction_AcquireLockTimeout: "The transaction was unable to acquire a lock, for instance due to a timeout or the transaction thread being interrupted." - Neo_TransientError_Transaction_DeadlockDetected: "This transaction, and at least one more transaction, has acquired locks in a way that it will wait indefinitely, and the database has aborted it. Retrying this transaction will most likely be successful." \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/config/test-apis-ci/users-configuration.yaml b/test-apis-ci/src/test/resources/config/test-apis-ci/users-configuration.yaml deleted file mode 100644 index a6c23653f0..0000000000 --- a/test-apis-ci/src/test/resources/config/test-apis-ci/users-configuration.yaml +++ /dev/null @@ -1,2 +0,0 @@ -userCredentials: - ci: 2a1f887d607d4515d4066fe0f5452a50:0a0dc557c3bf594b1a48030e3e99227580168b21f44e285c69740b8d5b13e33b \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/cucumber/tenantIsolation.feature b/test-apis-ci/src/test/resources/cucumber/tenantIsolation.feature deleted file mode 100644 index f1a0f6f6e3..0000000000 --- a/test-apis-ci/src/test/resources/cucumber/tenantIsolation.feature +++ /dev/null @@ -1,38 +0,0 @@ -Feature: Tenant Isolation Feature - - #Get individual external AT&T Certificate API - Scenario Outline: Create operational Envrionment - Given AAI returns and aai_body contains and - When The Number Of Operational Envrinoments that created is and Records are added with data - Then The Number Of Environment is with status - #Verify Succesfull A&AI Call - And Operational Environment record contains tenant field - And Operational Environment record contains workload field - #Verify Succesfull DME Call - And Operational Environment record contains UEB Address field - - Examples: - | retcode | tenant | workload | recordData | numberOfEnvs | recordStatus | isTenantExist | isWorkloadtExist | isUebAddressExist | - | 200 | Test | VNF_Development | {"status": "failed", "last_modified_delta": 0} | 1 | completed | true | true | true | - - Scenario Outline: Distribute To Operational Environment - Given ASDC Address is 127.0.0.1 - And The number of complete environments is - #Start SImulator for each envrionment - And The number of artifacts each Simulator downloads from a service is - #5 (3 days) - run jar - And MSO-WD Simulators Started with topic name MSHITRIT-D2D - And ASDC Contains the following services - # (1.5 days) - And MSO Final Distribution Simulator is UP - #4 (Sends 75 request )(2 days) - When Distribution Requests are Sent By MSO - Then All MSO-WD Simulators Sent The Distribution Complete Notifications - And All Artifacts were downloaded by Simulators - #6 - And MSO Final Distribution Recieved Correct Number Of Request - - Examples: - | numberOfEnvs | numberOfArtifactsDownloaded | ListOfServicesUUID | - #| 5 | 8 | 74e05aac-48d5-4642-8dc1-dc1ddeb5c0f5,fa86100a-409b-4310-835c-e401896181a5,8dbc41cc-2076-49c0-b95b-cb37b1539367,0c7eb2ac-06c0-41e1-b635-825037942e28,840123d1-b9d6-4036-8e94-471b268026bf,74331473-1eb0-4628-84b8-ab47948f7023, 3277af19-d152-4d94-a4d0-44ad6f226b52, e553c12b-b67b-4d66-a6a9-8676d5e0becf, f648052e-3207-4eb2-9336-29f2fe9df618, 535c6ad3-ad2b-429f-ab9b-b654cf647c86,611c764d-8862-4f09-a8e0-1622f8d97ce9, b5df0774-2445-4daf-b893-61c014652145, 01481626-b58a-49b5-ba1e-74eb8508ed15, 9e17345a-d11d-4219-b4e3-e86cfdb51d07, 5ff40fbc-f4e9-45f1-85de-0a04b8a5d60c | - | 2 | 2 | 74e05aac-48d5-4642-8dc1-dc1ddeb5c0f5,fa86100a-409b-4310-835c-e401896181a5 | diff --git a/test-apis-ci/src/test/resources/logback-test.xml b/test-apis-ci/src/test/resources/logback-test.xml deleted file mode 100644 index 03ce9d1243..0000000000 --- a/test-apis-ci/src/test/resources/logback-test.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n - - - - - - - \ No newline at end of file diff --git a/test-apis-ci/src/test/resources/preferredRouter.txt b/test-apis-ci/src/test/resources/preferredRouter.txt deleted file mode 100644 index e69de29bb2..0000000000 -- cgit 1.2.3-korg