diff options
44 files changed, 64 insertions, 48 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip b/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip Binary files differindex ac2d7c8df2..3f623fc972 100644 --- a/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip +++ b/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml index 56da214e88..38d4c06ec7 100644 --- a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml @@ -269,4 +269,4 @@ tosca.capabilities.nfv.ext.Compute.Container.Architecture: type: string mem_size: type: string - required: false
\ No newline at end of file + required: false diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip Binary files differindex dce4bf7565..de4aa48a1d 100644 --- a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip +++ b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip Binary files differindex 897cb36b18..2fc617983c 100644 --- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip +++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip Binary files differindex 84bc0c928d..1c6ad9013e 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip Binary files differindex 3a26c09f43..d7dd67c205 100644 --- a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip +++ b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml index 85cff11c2a..39697c0b68 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml @@ -8,4 +8,4 @@ node_types: cr_role: type: string cr_type: - type: string + type: string
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip Binary files differindex c5dc361e07..092393278d 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip Binary files differindex 060dec1aa1..e5bcd325d2 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.yml b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.yml new file mode 100644 index 0000000000..ac169a3748 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.yml @@ -0,0 +1,14 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.nodes.VLANNetworkReceptor: + derived_from: tosca.nodes.Root + capabilities: + routing_configuration_internal: + type: org.openecomp.capabilities.RoutingConfiguration + requirements: + - vlan_assignment: + occurrences: + - 1 + - UNBOUNDED + capability: org.openecomp.capabilities.VLANAssignment + relationship: org.openecomp.relationships.AssignsTo
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip Binary files differnew file mode 100644 index 0000000000..cb99fae722 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip Binary files differindex 2c38ab43a1..48d1908b8a 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip Binary files differindex 8b9a455c54..be5bf9d01f 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml new file mode 100644 index 0000000000..43fceaf535 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml @@ -0,0 +1,18 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.nodes.Configuration: + derived_from: tosca.nodes.Root + properties: + type: + type: string + description: The type of the node, the configuration will be defined for it. Ex.”SBC” + required: false + role: + type: string + description: The role of the node, the configuration will be defined for it. Ex. “Active”, “Standby” + required: false + function: + type: string + description: The function of the node, the configuration will be defined for it. Ex. “NAT Traversal” + required: false + diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip Binary files differnew file mode 100644 index 0000000000..cb0d191221 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip Binary files differindex 11d99be2e3..4486fe44e4 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip Binary files differindex c0cc411e5d..06fb34db51 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip Binary files differindex 639164711f..633f7c7659 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip Binary files differindex 60950b65cc..054af8b190 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip Binary files differindex 43f499bdbb..ab6f90eb1f 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip Binary files differindex 02b62a69da..8a790a546f 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip Binary files differindex efeafe824e..f54d7d2c1b 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip b/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip Binary files differindex c8368a5923..c85c133155 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip Binary files differindex e33365a8ca..884dae17e1 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip b/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip Binary files differindex 54274e78f5..1adb0ded4c 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip b/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip Binary files differindex 607fe0c930..94bcddfa19 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip b/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip Binary files differindex 54fb2ffb80..51bfe51d32 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip +++ b/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip diff --git a/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip b/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip Binary files differindex 574a4844d3..e18013a719 100644 --- a/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip +++ b/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml index 541126f7e3..68ecf90104 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml @@ -3,19 +3,9 @@ node_types: tosca.nodes.nfv.VDU: derived_from: tosca.nodes.SoftwareComponent capabilities: -#Not found in any spec -# high_availability: -# type: nfv.capabilities.HA Virtualbinding: type: tosca.capabilities.nfv.VirtualBindable -# monitoring_parameter: -# type: nfv.capabilities.Metric requirements: -#Not found in any spec -# - high_availability: -# capability: nfv.capabilities.HA -# relationship: nfv.relationships.HA -# occurrences: [ 0, 1 ] - host: capability: tosca.capabilities.Container node: tosca.nodes.Compute diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip Binary files differindex 9010bf0544..32487dc65c 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml index cf7b5cc490..00d3bd243d 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml @@ -34,4 +34,5 @@ node_types: - service_dependency: capability: org.openecomp.capabilities.AllottedResource relationship: tosca.relationships.DependsOn + node: tosca.services.Root diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip Binary files differindex 1417651d5f..fd3f7e9d79 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml index 1c461681a2..6924a28901 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml @@ -1,4 +1,3 @@ -#NOT SPEC COMPLAINT!!!!!!!!!!!!!!!!!!!!!! tosca_definitions_version: tosca_simple_yaml_1_0_0 node_types: tosca.nodes.nfv.VduCp: @@ -23,11 +22,6 @@ node_types: entry_schema: type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements required: false - # order: #there is no this attribute in IM. - # type: integer - # required: false - # constraints: - # - greater_or_equal: 0 requirements: - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip Binary files differindex c5a43abf5b..4da5c12ad2 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip b/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip Binary files differindex 3a847c6f56..dc57864564 100644 --- a/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip +++ b/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip Binary files differindex 29dd88e4b3..f1a55ef046 100644 --- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip +++ b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip diff --git a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip Binary files differindex bc709874a0..be7dcd0fbb 100644 --- a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip +++ b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 1cdefc22bc..d19c6e3a69 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -89,7 +89,7 @@ <jetty.servlets.version>9.0.6.v20130930</jetty.servlets.version> <jersey.core.version>1.19.1</jersey.core.version> <jersey.multipart.version>1.18.1</jersey.multipart.version> - <junit.version>RELEASE</junit.version> + <junit.version>4.12</junit.version> <logback.version>1.1.2</logback.version> <mockito.all.version>1.10.19</mockito.all.version> <org.codehaus.jackson.version>1.9.13</org.codehaus.jackson.version> <!-- orignal 1.9.2 --> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index 6114876d2d..d9b3676b5d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -54,7 +54,12 @@ <groupId>org.testng</groupId> <artifactId>testng</artifactId> </dependency> - + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> <!-- Java Stuff --> <dependency> <groupId>javax.inject</groupId> @@ -78,10 +83,4 @@ <version>${project.version}</version> </dependency> </dependencies> - - - - - - </project> diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index 999f112f87..5376a037fb 100644 --- a/test-apis-ci/pom.xml +++ b/test-apis-ci/pom.xml @@ -305,9 +305,9 @@ </dependency> <dependency> - <groupId>org.openecomp.sdc.sdc-tosca</groupId> + <groupId>org.onap.sdc.sdc-tosca</groupId> <artifactId>sdc-tosca</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <scope>compile</scope> </dependency> diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java index a464eb1bdf..8270515643 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java @@ -6,14 +6,14 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; -import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; -import org.openecomp.sdc.tosca.parser.impl.SdcTypes; -import org.openecomp.sdc.toscaparser.api.Group; -import org.openecomp.sdc.toscaparser.api.NodeTemplate; -import org.openecomp.sdc.toscaparser.api.elements.Metadata; -import org.openecomp.sdc.toscaparser.api.parameters.Input; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException; +import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; +import org.onap.sdc.tosca.parser.impl.SdcTypes; +import org.onap.sdc.toscaparser.api.Group; +import org.onap.sdc.toscaparser.api.NodeTemplate; +import org.onap.sdc.toscaparser.api.elements.Metadata; +import org.onap.sdc.toscaparser.api.parameters.Input; public class CsarToscaTester { diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java index e81c63fa53..36fdf06a36 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java @@ -93,8 +93,8 @@ import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils; import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser; import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils; import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; import org.testng.SkipException; import com.aventstack.extentreports.Status; diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java index 14583607c7..324966c105 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java @@ -25,11 +25,11 @@ import org.openecomp.sdc.ci.tests.utils.general.ElementFactory; import org.openecomp.sdc.ci.tests.utils.general.OnboardingUtillViaApis; import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils; import org.openecomp.sdc.ci.tests.verificator.ToscaValidation; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; -import org.openecomp.sdc.toscaparser.api.Group; -import org.openecomp.sdc.toscaparser.api.NodeTemplate; -import org.openecomp.sdc.toscaparser.api.elements.Metadata; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; +import org.onap.sdc.toscaparser.api.Group; +import org.onap.sdc.toscaparser.api.NodeTemplate; +import org.onap.sdc.toscaparser.api.elements.Metadata; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java index 203368d361..1c44f1ab4c 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java @@ -5,11 +5,11 @@ import fj.data.Either; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest; import org.openecomp.sdc.ci.tests.tosca.datatypes.*; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.toscaparser.api.Group; -import org.openecomp.sdc.toscaparser.api.Property; -import org.openecomp.sdc.toscaparser.api.elements.Metadata; -import org.openecomp.sdc.toscaparser.api.parameters.Input; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.toscaparser.api.Group; +import org.onap.sdc.toscaparser.api.Property; +import org.onap.sdc.toscaparser.api.elements.Metadata; +import org.onap.sdc.toscaparser.api.parameters.Input; import java.lang.reflect.Field; import java.util.HashMap; |