type: string
mem_size:
type: string
- required: false
\ No newline at end of file
+ required: false
cr_role:
type: string
cr_type:
- type: string
+ type: string
\ No newline at end of file
--- /dev/null
+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
--- /dev/null
+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.\94SBC\94
+ required: false
+ role:
+ type: string
+ description: The role of the node, the configuration will be defined for it. Ex. \93Active\94, \93Standby\94
+ required: false
+ function:
+ type: string
+ description: The function of the node, the configuration will be defined for it. Ex. \93NAT Traversal\94
+ required: false
+
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
- service_dependency:
capability: org.openecomp.capabilities.AllottedResource
relationship: tosca.relationships.DependsOn
+ node: tosca.services.Root
-#NOT SPEC COMPLAINT!!!!!!!!!!!!!!!!!!!!!!
tosca_definitions_version: tosca_simple_yaml_1_0_0
node_types:
tosca.nodes.nfv.VduCp:
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
<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 -->
<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>
<version>${project.version}</version>
</dependency>
</dependencies>
-
-
-
-
-
-
</project>
</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>
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 {
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;
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;
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;