Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Update portmapping model
[transportpce.git] / olm / src / test / java / org / opendaylight / transportpce / olm / util / OlmTransactionUtils.java
diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java
index 9d092b79ef14253d9a8ad424f01c3f04618738d2..a3031b3efe091e931462aecf81759b7730aa2eab 100644 (file)
--- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java
+++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java
@@ -17,8 +17,8 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210927.mapping.MappingBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev191129.FiberPmd;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev191129.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.Direction;
@@ -64,6 +64,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.link.DestinationBuilder;
@@ -80,7 +81,10 @@ public final class OlmTransactionUtils {
     private OlmTransactionUtils() {
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked","rawtypes"})
+    // FIXME check if the InstanceIdentifier raw type can be avoided
+    // Raw types use are discouraged since they lack type safety.
+    // Resulting Problems are observed at run time and not at compile time
     public static void writeTransaction(DataBroker dataBroker, InstanceIdentifier instanceIdentifier,
                                         DataObject object) {
         @NonNull
@@ -133,43 +137,49 @@ public final class OlmTransactionUtils {
         Map<AmplifiedLinkKey,AmplifiedLink>
                 amplifiedLinkValues = new HashMap<>();
         org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes.AmplifiedLink al =
-            new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes
-            .AmplifiedLinkBuilder()
-                .setSectionElement(new SectionElementBuilder().setSectionElement(
-                            new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes
-                            .amplified.link.section.element.section.element.SpanBuilder().setSpan(
-                                    new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link
-                                    .attributes.amplified.link.section.element.section.element.span.SpanBuilder()
-                                        .setAdministrativeState(AdminStates.InService)
-                                        .setAutoSpanloss(true)
-                                        .setEngineeredSpanloss(new RatioDB(BigDecimal.ONE))
-                                        .setLinkConcatenation(linkConcentationValues)
-                                        .setSpanlossBase(new RatioDB(BigDecimal.ONE))
-                                        .setSpanlossCurrent(new RatioDB(BigDecimal.ONE))
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes
+                        .AmplifiedLinkBuilder()
+                        .setSectionElement(new SectionElementBuilder().setSectionElement(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified
+                                        .link.attributes
+                                        .amplified.link.section.element.section.element.SpanBuilder()
+                                        .setSpan(new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529
+                                                .amplified.link.attributes.amplified.link.section.element
+                                                .section.element
+                                                .span.SpanBuilder()
+                                                .setAdministrativeState(AdminStates.InService)
+                                                .setAutoSpanloss(true)
+                                                .setEngineeredSpanloss(new RatioDB(BigDecimal.ONE))
+                                                .setLinkConcatenation(linkConcentationValues)
+                                                .setSpanlossBase(new RatioDB(BigDecimal.ONE))
+                                                .setSpanlossCurrent(new RatioDB(BigDecimal.ONE))
+                                                .build())
                                         .build())
                                 .build())
-                        .build())
-                .setSectionEltNumber(Uint16.valueOf(1))
-                .build();
+                        .setSectionEltNumber(Uint16.valueOf(1))
+                        .build();
         org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes.AmplifiedLink al2 =
-            new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes
-            .AmplifiedLinkBuilder()
-                .setSectionElement(new SectionElementBuilder().setSectionElement(
-                            new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes
-                            .amplified.link.section.element.section.element.SpanBuilder().setSpan(
-                                    new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link
-                                    .attributes.amplified.link.section.element.section.element.span.SpanBuilder()
-                                        .setAdministrativeState(AdminStates.InService)
-                                        .setAutoSpanloss(true)
-                                        .setEngineeredSpanloss(new RatioDB(BigDecimal.ONE))
-                                        .setLinkConcatenation(linkConcentationValues)
-                                        .setSpanlossBase(new RatioDB(BigDecimal.ONE))
-                                        .setSpanlossCurrent(new RatioDB(BigDecimal.ONE))
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes
+                        .AmplifiedLinkBuilder()
+                        .setSectionElement(new SectionElementBuilder().setSectionElement(
+                                new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified
+                                        .link.attributes
+                                        .amplified.link.section.element.section.element.SpanBuilder()
+                                        .setSpan(new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529
+                                                .amplified.link.attributes.amplified.link.section.element
+                                                .section.element
+                                                .span.SpanBuilder()
+                                                .setAdministrativeState(AdminStates.InService)
+                                                .setAutoSpanloss(true)
+                                                .setEngineeredSpanloss(new RatioDB(BigDecimal.ONE))
+                                                .setLinkConcatenation(linkConcentationValues)
+                                                .setSpanlossBase(new RatioDB(BigDecimal.ONE))
+                                                .setSpanlossCurrent(new RatioDB(BigDecimal.ONE))
+                                                .build())
                                         .build())
                                 .build())
-                        .build())
-                .setSectionEltNumber(Uint16.valueOf(1))
-                .build();
+                        .setSectionEltNumber(Uint16.valueOf(1))
+                        .build();
         amplifiedLinkValues.put(al.key(),al);
         amplifiedLinkValues.put(al2.key(),al2);
         Map<Class<? extends Augmentation<Link>>, Augmentation<Link>> map = Collections.emptyMap();
@@ -181,8 +191,8 @@ public final class OlmTransactionUtils {
                         .build())
                 .build();
         org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1 aug12 =
-            new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder()
-                .setLinkType(OpenroadmLinkType.ROADMTOROADM).build();
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder()
+                        .setLinkType(OpenroadmLinkType.ROADMTOROADM).build();
         Augmentation<Link> aug21 = new Link1Builder()
                 .setAmplified(true)
                 .setOMSAttributes(new OMSAttributesBuilder()
@@ -190,18 +200,23 @@ public final class OlmTransactionUtils {
                         .setSpan(new SpanBuilder().build()).build())
                 .build();
         org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1 aug22 =
-            new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder()
-                .setLinkType(OpenroadmLinkType.ROADMTOROADM).build();
+                new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder()
+                        .setLinkType(OpenroadmLinkType.ROADMTOROADM).build();
         // create the roadm-to-roadm link to be measured
         Link roadm2roadmLink = new LinkBuilder().setLinkId(new LinkId("ROADM-A1-to-ROADM-C1"))
-            .setSource(new SourceBuilder().setSourceNode(ietfNodeA.getNodeId()).setSourceTp("DEG2-TTP-TXRX").build())
-            .setDestination(
-                new DestinationBuilder().setDestNode(ietfNodeC.getNodeId()).setDestTp("DEG1-TTP-TXRX").build())
-            .addAugmentation(aug11)
-            .addAugmentation(aug12)
-            .addAugmentation(aug21)
-            .addAugmentation(aug22)
-            .build();
+                .setSource(new SourceBuilder()
+                        .setSourceNode(ietfNodeA.getNodeId())
+                        .setSourceTp(new TpId("DEG2-TTP-TXRX"))
+                        .build())
+                .setDestination(new DestinationBuilder()
+                        .setDestNode(ietfNodeC.getNodeId())
+                        .setDestTp(new TpId("DEG1-TTP-TXRX"))
+                        .build())
+                .addAugmentation(aug11)
+                .addAugmentation(aug12)
+                .addAugmentation(aug21)
+                .addAugmentation(aug22)
+                .build();
         // create the ietf network
         Network1 openroadmAugmToIetfNetwork = new Network1Builder()
                 .setLink(Map.of(roadm2roadmLink.key(),roadm2roadmLink)).build();
@@ -227,23 +242,26 @@ public final class OlmTransactionUtils {
     public static Optional<CurrentPmList> getCurrentPmListA() {
         Measurement measurementA = new MeasurementBuilder()
                 .withKey(new MeasurementKey(PmGranularity._15min))
-                .setGranularity(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmGranularity._15min)
+                .setGranularity(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215
+                        .PmGranularity._15min)
                 .setPmParameterValue(new PmDataType(new BigDecimal("-3.5")))
                 .setValidity(Validity.Complete)
                 .build();
         CurrentPm cpA = new CurrentPmBuilder()
                 .withKey(new CurrentPmKey(Direction.Bidirectional,
                         "", Location.NotApplicable, PmNamesEnum.OpticalPowerOutput))
-            .setType(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum.OpticalPowerOutput)
-            .setMeasurement(Map.of(measurementA.key(),measurementA))
-            .build();
+                .setType(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum
+                        .OpticalPowerOutput)
+                .setMeasurement(Map.of(measurementA.key(),measurementA))
+                .build();
         InstanceIdentifier<Interface> interfaceIIDA = InstanceIdentifier.create(OrgOpenroadmDevice.class)
                 .child(Interface.class, new InterfaceKey("OTS-DEG2-TTP-TXRX"));
         CurrentPmEntry currentPmEntryA = new CurrentPmEntryBuilder()
                 .setCurrentPm(Map.of(cpA.key(),cpA))
                 .setPmResourceInstance(interfaceIIDA)
                 .setPmResourceType(
-                    org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev181019.ResourceTypeEnum.Interface)
+                        org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev181019.ResourceTypeEnum
+                                .Interface)
                 .setPmResourceTypeExtension("")
                 .setRetrievalTime(new DateAndTime("2018-06-07T13:22:58+00:00"))
                 .build();
@@ -260,16 +278,18 @@ public final class OlmTransactionUtils {
         CurrentPm cpC = new CurrentPmBuilder()
                 .withKey(new CurrentPmKey(Direction.Bidirectional,
                         "", Location.NotApplicable, PmNamesEnum.OpticalPowerInput))
-            .setType(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum.OpticalPowerInput)
-            .setMeasurement(Map.of(measurementC.key(),measurementC))
-            .build();
+                .setType(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum
+                        .OpticalPowerInput)
+                .setMeasurement(Map.of(measurementC.key(),measurementC))
+                .build();
         InstanceIdentifier<Interface> interfaceIIDC = InstanceIdentifier.create(OrgOpenroadmDevice.class)
                 .child(Interface.class, new InterfaceKey("OTS-DEG1-TTP-TXRX"));
         CurrentPmEntry currentPmEntryC = new CurrentPmEntryBuilder()
                 .setCurrentPm(Map.of(cpC.key(),cpC))
                 .setPmResourceInstance(interfaceIIDC)
                 .setPmResourceType(
-                    org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev181019.ResourceTypeEnum.Interface)
+                        org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev181019
+                                .ResourceTypeEnum.Interface)
                 .setPmResourceTypeExtension("")
                 .setRetrievalTime(new DateAndTime("2018-06-07T13:22:58+00:00"))
                 .build();
Repository for Transport PCE project.