<artifactId>sdc-tosca</artifactId>
<name>sdc-sdc-tosca</name>
<description>SDC Tosca Parser JAR file for use by consumers</description>
- <version>1.4.12-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<dependency>
<groupId>org.onap.sdc.jtosca</groupId>
<artifactId>jtosca</artifactId>
- <version>1.4.10</version>
+ <version>1.5.0-SNAPSHOT</version>
</dependency>
* Retrieves entity instance template type.
* @return {@link EntityTemplateType} enum entry describing given object type
*/
- EntityTemplateType getType();
+ EntityTemplateType getEntityType();
/**
* Retrieves entity instance name
*/
String getName();
+ /**
+ * Retrieves entity Tosca type
+ */
+ String getToscaType();
+
/**
* Retrieves entity {@link Metadata} object
*/
*/
Map<String, Property> getProperties();
+ /**
+ * Retrieves member names of the entity instance
+ * @return List of member names
+ */
+ List<String> getMembers();
+
/**
* Retrieves member nodes of the entity instance
* @return List of member nodes entity objects
/**
* Retrieves list of policy target entity instances (groups or node templates)
*/
- List<IEntityDetails> getTargetNodes();
+ List<IEntityDetails> getTargetEntities();
}
\ No newline at end of file
* SDC (node template) type, tosca type as well as optional customizationUUID and UUID
* @param topologyTemplateQuery parameters of the topology template containing the above entity.
* Includes SDC type of the container and optional customizationUUID
- * @param isRecursive indicates if the search within the required topology template is recursive.
+ * @param isRecursive indicates if the search is recursive starting from the required topology template .
* @return list of @{@link IEntityDetails} objects containing information about the found entities.
* If either no entities found or the provided query is incorrect, an empty list is returned
*/
}
@Override
- public List<IEntityDetails> getTargetNodes() {
+ public List<IEntityDetails> getTargetEntities() {
return Collections.emptyList();
}
return pathBld.toString();
}
+ @Override
+ public String getToscaType() {
+ return entityTemplate.getType();
+ }
+
+ @Override
+ public List<String> getMembers() { return Collections.emptyList(); }
+
}
}
@Override
- public EntityTemplateType getType() {
+ public EntityTemplateType getEntityType() {
return EntityTemplateType.GROUP;
}
public Metadata getMetadata() {
return group.getMetadata();
}
+
+ @Override
+ public List<String> getMembers() {
+ if (group.getMembers() != null) {
+ return group.getMembers();
+ }
+ return super.getMembers();
+ }
}
}
@Override
- public EntityTemplateType getType() {
+ public EntityTemplateType getEntityType() {
return EntityTemplateType.NODE_TEMPLATE;
}
}
@Override
- public EntityTemplateType getType() {
+ public EntityTemplateType getEntityType() {
return EntityTemplateType.POLICY;
}
}
@Override
- public List<IEntityDetails> getTargetNodes() {
+ public List<IEntityDetails> getTargetEntities() {
if (policy.getTargetsType().equals(NODE_TEMPLATES_TARGET_TYPE)) {
return policy.getTargetsList()
.stream()
@Override
public List<NodeTemplate> getPolicyTargetsFromOrigin(NodeTemplate nodeTemplate, String policyName) {
- Optional<Policy> policyOpt = null;
if(StringUtils.isNotEmpty(nodeTemplate.getName())){
- policyOpt = getNodeTemplateByName(nodeTemplate.getName()).getOriginComponentTemplate().getPolicies().stream().filter(p -> p.getName().equals(policyName)).findFirst();
- }
- if(policyOpt.isPresent()){
- List<String> targets = policyOpt.get().getTargets();
- return nodeTemplate.getOriginComponentTemplate().getNodeTemplates()
- .stream()
- .filter(nt -> targets.contains(nt.getName())).collect(Collectors.toList());
+ Optional<Policy> policyOpt = getNodeTemplateByName(nodeTemplate.getName())
+ .getOriginComponentTemplate()
+ .getPolicies()
+ .stream()
+ .filter(p -> p.getName()
+ .equals(policyName))
+ .findFirst();
+ if(policyOpt.isPresent()){
+ List<String> targets = policyOpt.get().getTargets();
+ if (targets != null) {
+ return nodeTemplate.getOriginComponentTemplate().getNodeTemplates()
+ .stream()
+ .filter(nt -> targets.contains(nt.getName())).collect(Collectors.toList());
+ }
+ }
}
return new ArrayList<>();
}
return new ArrayList<>();
return toscaTemplate.getPolicies()
.stream()
- .filter(p -> p.getTargets().contains(nodeTemplateName))
+ .filter(p -> p.getTargets()!= null && p.getTargets().contains(nodeTemplateName))
.collect(toList());
}
--- /dev/null
+package org.onap.sdc.impl;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.sdc.tosca.parser.api.IEntityDetails;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.elements.queries.EntityQuery;
+import org.onap.sdc.tosca.parser.elements.queries.TopologyTemplateQuery;
+import org.onap.sdc.tosca.parser.enums.SdcTypes;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.toscaparser.api.CapabilityAssignment;
+import org.onap.sdc.toscaparser.api.RequirementAssignment;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class GetEntityPortMirroringTest {
+
+ private final static String cap0 = "vepdg5afn0.vlb_1.port_mirroring_vlb_gn_vepdg_fn_5_RVMI";
+ private final static String cap1 = "radcomfnvlbavf11_3_3vepdg0.abstract_vlbagentbase_eph_aff.port_mirroring_vlbagentbase_eph_aff_vlbagentbase_eph_aff_int_pktmirror_1_port";
+ private static ISdcCsarHelper helper = null;
+
+ @BeforeClass
+ public static void setUpClass() {
+ try {
+ URL resource = GetEntityPortMirroringTest.class.getClassLoader()
+ .getResource("csars/service-JennnyVepdgPortMirroringTest-csar.csar");
+ if (resource != null) {
+ helper = SdcToscaParserFactory.getInstance().getSdcCsarHelper(resource.getFile());
+ }
+
+ } catch (SdcToscaParserException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void getServiceConfigurations() {
+ EntityQuery entityQuery = EntityQuery.newBuilder(SdcTypes.CONFIGURATION)
+ .build();
+ TopologyTemplateQuery topologyTemplateQuery = TopologyTemplateQuery.newBuilder(SdcTypes.SERVICE)
+ .build();
+
+ List<IEntityDetails> entities = helper.getEntity(entityQuery, topologyTemplateQuery, false);
+
+ assertEquals(1, entities.size());
+ assertEquals("54308d8b-21ca-40a1-bd3e-efde64791605", entities.get(0).getMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+ assertEquals("Port Mirroring Configuration", entities.get(0).getMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
+ assertEquals(2, entities.get(0).getRequirements().size());
+ assertTrue(entities.get(0).getProperties().isEmpty());
+ assertEquals(1, entities.get(0).getCapabilities().size());
+ }
+
+ @Test
+ public void getServiceProxyOnService() {
+ EntityQuery entityQuery = EntityQuery.newBuilder(SdcTypes.SERVICE_PROXY)
+ .build();
+ TopologyTemplateQuery topologyTemplateQuery = TopologyTemplateQuery.newBuilder(SdcTypes.SERVICE)
+ .build();
+
+ List<IEntityDetails> entities = helper.getEntity(entityQuery, topologyTemplateQuery, false);
+
+ assertEquals(2, entities.size());
+ assertTrue("vEPDG-5A-FN SVC Service Proxy".equals(entities.get(0).getMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)) ||
+ "vEPDG-5A-FN SVC Service Proxy".equals(entities.get(1).getMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+ assertTrue("Radcom FN vLBA SVC 11_3_3 vEPDG Service Proxy".equals(entities.get(0).getMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)) ||
+ "Radcom FN vLBA SVC 11_3_3 vEPDG Service Proxy".equals(entities.get(1).getMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_NAME)));
+
+ assertTrue(entities.get(0).getRequirements().isEmpty());
+ assertTrue(entities.get(0).getProperties().isEmpty());
+ assertEquals(940, entities.get(0).getCapabilities().size());
+ assertEquals(197, entities.get(1).getCapabilities().size());
+ }
+
+ @Test
+ public void getCapabilityForCOnfigurationRequirementOnService() {
+ EntityQuery entityQueryC = EntityQuery.newBuilder(SdcTypes.CONFIGURATION)
+ .build();
+
+ EntityQuery entityQueryS = EntityQuery.newBuilder(SdcTypes.SERVICE_PROXY)
+ .build();
+ TopologyTemplateQuery topologyTemplateQuery = TopologyTemplateQuery.newBuilder(SdcTypes.SERVICE)
+ .build();
+
+ List<IEntityDetails> configurationNodes = helper.getEntity(entityQueryC, topologyTemplateQuery, false);
+ List<IEntityDetails> proxyNodes = helper.getEntity(entityQueryS, topologyTemplateQuery, false);
+
+ assertEquals(2, proxyNodes.size());
+ assertEquals(1, configurationNodes.size());
+
+ Map<String, RequirementAssignment> reqMap = configurationNodes.get(0).getRequirements();
+ assertEquals(cap0, reqMap.get("source").getCapabilityName());
+ assertEquals(cap1, reqMap.get("collector").getCapabilityName());
+
+ assertTrue(isCapabilityFound(proxyNodes.get(0), cap0));
+ assertTrue(isCapabilityFound(proxyNodes.get(1), cap1));
+ }
+
+ private boolean isCapabilityFound(IEntityDetails nodeDetails, String capName) {
+ List<CapabilityAssignment> assignments = nodeDetails.getCapabilities()
+ .values()
+ .stream()
+ .filter(ca->capName.equals(ca.getDefinition()
+ .getName()))
+ .collect(Collectors.toList());
+ return assignments.size() == 1;
+ }
+}
}
}
- @Test
+ @Test
public void getCpEntitiesFromCVFC() {
EntityQuery entityQuery = EntityQuery.newBuilder(SdcTypes.CP)
.build();
assertTrue(entities.get(0).getMemberNodes().get(0).getName().equals("abstract_rtp_msc") ||
entities.get(0).getMemberNodes().get(1).getName().equals("abstract_rtp_msc"));
assertEquals(4, entities.get(0).getProperties().size());
+ assertEquals(2, entities.get(0).getMembers().size());
assertTrue(entities.get(0).getRequirements().isEmpty());
}
List<IEntityDetails> entities = helper.getEntity(entityQuery, topologyTemplateQuery, false);
assertEquals(1, entities.size());
+ assertEquals("org.openecomp.groups.VfModule", entities.get(0).getToscaType());
+ assertTrue(entities.get(0).getPath().isEmpty());
+ assertTrue(entities.get(0).getMembers().isEmpty());
assertNull(entities.get(0).getParent());
+ assertTrue(entities.get(0).getTargets().isEmpty());
}
@Test
List<IEntityDetails> entities = helper.getEntity(entityQuery, topologyTemplateQuery, true);
assertEquals(19, entities.size());
- assertTrue(entities.get(9).getTargetNodes().isEmpty());
+ assertTrue(entities.get(9).getTargetEntities().isEmpty());
+ assertEquals(1, entities.get(7).getMembers().size());
+ assertEquals("org.openecomp.groups.VfModule", entities.get(7).getToscaType());
assertEquals("rtp_msc_subint_avpn_vmi_0", entities.get(5).getMemberNodes().get(0).getName());
}
assertEquals(1, entities.size());
assertEquals("jennyvtsbcvlanvnf..External..0", entities.get(0).getMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_NAME));
- assertEquals(EntityTemplateType.GROUP, entities.get(0).getTargetNodes().get(0).getType());
+ assertEquals(EntityTemplateType.GROUP, entities.get(0).getTargetEntities().get(0).getEntityType());
+ assertEquals("org.openecomp.policies.External", entities.get(0).getToscaType());
+ assertTrue(entities.get(0).getMembers().isEmpty());
assertEquals("jenny vTSBC vlan VNF 0", entities.get(0).getPath());
}
List<IEntityDetails> entities = helper.getEntity(entityQuery, topologyTemplateQuery, false);
assertEquals(1, entities.size());
- assertEquals(EntityTemplateType.GROUP, entities.get(0).getTargetNodes().get(0).getType());
+ assertEquals(EntityTemplateType.GROUP, entities.get(0).getTargetEntities().get(0).getEntityType());
+ assertTrue(entities.get(0).getMembers().isEmpty());
assertTrue(entities.get(0).getRequirements().isEmpty());
assertTrue(entities.get(0).getCapabilities().isEmpty());
assertEquals("jenny vTSBC vlan VNF 0", entities.get(0).getPath());
List<IEntityDetails> entities = helper.getEntity(null, topologyTemplateQuery, false);
assertEquals(5, entities.size());
+ assertEquals("org.openecomp.resource.vf.JennyVtsbcVlanVnf", entities.get(4).getToscaType());
+ assertEquals("org.openecomp.groups.VfModule", entities.get(0).getToscaType());
}
List<IEntityDetails> entities = helper.getEntity(null, topologyTemplateQuery, false);
assertEquals(2, entities.size());
- assertTrue("ssc_subint_mis_vmi_0".equals(entities.get(0).getName()) || "ssc_subint_mis_vmi_0".equals(entities.get(1).getName()));
+ assertTrue(entities.get(1).getMembers().isEmpty());
+ assertEquals("ssc_subint_mis_vmi_0", entities.get(0).getMembers().get(0));
+ assertTrue("ssc_subint_mis_vmi_0".equals(entities.get(1).getName()));
+ assertTrue("vlan_subinterface_ssc_mis_group".equals(entities.get(0).getName()));
+ assertEquals("org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface",
+ entities.get(1).getToscaType());
+ assertEquals("org.openecomp.groups.heat.HeatStack", entities.get(0).getToscaType());
+ assertTrue(entities.get(0).getTargetEntities().isEmpty());
+
}
@Test
--- /dev/null
+package org.onap.sdc.impl;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+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.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.Policy;
+
+import java.net.URL;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+public class ToscaParserPolicyTest {
+
+ private static ISdcCsarHelper helper = null;
+
+ @BeforeClass
+ public static void setUpClass() {
+ try {
+ URL resource = GetEntityPortMirroringTest.class.getClassLoader()
+ .getResource("csars/service-CgnatFwVnfNc-csar.csar");
+ if (resource != null) {
+ helper = SdcToscaParserFactory.getInstance().getSdcCsarHelper(resource.getFile());
+ }
+
+ } catch (SdcToscaParserException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void getPolicyOfTargetByNodeTemplate() {
+ List<NodeTemplate> vfList = helper.getServiceVfList();
+ assertEquals(1, vfList.size());
+ List<Policy> policies = helper.getPoliciesOfTarget(vfList.get(0));
+ assertNotNull(policies);
+ assertTrue(policies.isEmpty());
+ }
+
+ @Test
+ public void getPolicyTargetFromOrigin() {
+ List<NodeTemplate> vfList = helper.getServiceVfList();
+ assertEquals(1, vfList.size());
+ List<NodeTemplate> targets = helper.getPolicyTargetsFromOrigin(vfList.get(0), "cgnatfwvnf_nc..External..0");
+ assertNotNull(targets);
+ assertTrue(targets.isEmpty());
+ }
+
+
+}
//
// CapabilityAssignment cCp = lCapabilitys.get(CPkeys.get(i));
// CapabilityTypeDef CpDef = cCp.getDefinition();
-// CapabilitiesTypes.add(CpDef.getType());
+// CapabilitiesTypes.add(CpDef.getEntityType());
//
// //LinkedHashMap<String,Object> lProperties = cCp.getDefinition().getProperties();
// LinkedHashMap<String, Property> lPropertiesR = cCp.getProperties();
// Property p = lPropertiesR.get(CP_Propkeys.get(j));
//
// if(p != null){
-// String sPType = p.getType();
+// String sPType = p.getEntityType();
// Boolean bPRequired = p.isRequired();
//
// System.out.println(sPType + " " + bPRequired);
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=4
-patch=12
+minor=5
+patch=0
base_version=${major}.${minor}.${patch}