X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Futil%2FOlmTransactionUtils.java;h=c0388193faaf522a373105df53d3eb26eae410d4;hb=34cbca4ad81fbd29e833197f0e4b09128daa8b95;hp=69c70e686b0df1d096a43838cc0be670ce511b3b;hpb=8ea6d16bba042fed9f2d12347b1a9ca99074a779;p=transportpce.git 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 69c70e686..c0388193f 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java @@ -19,8 +19,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.rev190702.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200113.network.nodes.MappingBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.FiberPmd; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.RatioDB; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State; @@ -72,6 +72,7 @@ public final class OlmTransactionUtils { private OlmTransactionUtils() { } + @SuppressWarnings("unchecked") public static void writeTransaction(DataBroker dataBroker, InstanceIdentifier instanceIdentifier, DataObject object) { @NonNull @@ -136,10 +137,10 @@ public final class OlmTransactionUtils { .setSectionEltNumber(Integer.valueOf(1)).build(); org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link.attributes.AmplifiedLink al2 = new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link.attributes - .AmplifiedLinkBuilder().setSectionElement(new SectionElementBuilder() - .setSectionElement(new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link - .attributes.amplified.link.section.element.section.element.SpanBuilder() - .setSpan(new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link + .AmplifiedLinkBuilder().setSectionElement(new SectionElementBuilder() + .setSectionElement(new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link + .attributes.amplified.link.section.element.section.element.SpanBuilder() + .setSpan(new org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link .attributes.amplified.link.section.element.section.element.span.SpanBuilder() .setAdministrativeState(AdminStates.InService) .setAutoSpanloss(true) @@ -155,49 +156,58 @@ public final class OlmTransactionUtils { amplifiedLinkValues.add(al); amplifiedLinkValues.add(al2); Map>, Augmentation> map = Collections.emptyMap(); - Augmentation aug1 = new Link1Builder().setAdministrativeGroup(Long.valueOf(123)) + Augmentation aug11 = new Link1Builder().setAdministrativeGroup(Long.valueOf(123)) .setAdministrativeState(State.InService) .setAmplified(true) .setLinkLatency(Long.valueOf(123)) .setLinkLength(BigDecimal.valueOf(123)) - .setLinkType(OpenroadmLinkType.ROADMTOROADM) .setOMSAttributes(new OMSAttributesBuilder() .setAmplifiedLink(new AmplifiedLinkBuilder().setAmplifiedLink(amplifiedLinkValues).build()) .setOppositeLink(new LinkId("link 1")) .setSpan(new SpanBuilder().build()) .setTEMetric(Long.valueOf(123)).build()) .setOperationalState(State.InService).build(); - Augmentation aug2 = new Link1Builder().setAdministrativeGroup(Long.valueOf(123)) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1 aug12 = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder() + .setLinkType(OpenroadmLinkType.ROADMTOROADM).build(); + Augmentation aug21 = new Link1Builder() + .setAdministrativeGroup(Long.valueOf(123)) .setAdministrativeState(State.InService) .setAmplified(true) .setLinkLatency(Long.valueOf(123)) .setLinkLength(BigDecimal.valueOf(123)) - .setLinkType(OpenroadmLinkType.ROADMTOROADM) .setOMSAttributes(new OMSAttributesBuilder() .setAmplifiedLink(new AmplifiedLinkBuilder().setAmplifiedLink(amplifiedLinkValues).build()) .setOppositeLink(new LinkId("link 1")) .setSpan(new SpanBuilder().build()) .setTEMetric(Long.valueOf(123)).build()) .setOperationalState(State.InService).build(); - + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1 aug22 = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder() + .setLinkType(OpenroadmLinkType.ROADMTOROADM).build(); // create the roadm-to-roadm link to be measured List ietfLinkList = new ArrayList<>(); 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(Link1.class, aug1) - .addAugmentation(Link1.class, aug2) - .build(); + .setSource(new SourceBuilder().setSourceNode(ietfNodeA.getNodeId()).setSourceTp("DEG2-TTP-TXRX").build()) + .setDestination( + new DestinationBuilder().setDestNode(ietfNodeC.getNodeId()).setDestTp("DEG1-TTP-TXRX").build()) + .addAugmentation(Link1.class, aug11) + .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class, + aug12) + .addAugmentation(Link1.class, aug21) + .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class, + aug22) + .build(); ietfLinkList.add(roadm2roadmLink); // create the ietf network Network1 openroadmAugmToIetfNetwork = new Network1Builder().setLink(ietfLinkList).build(); - NetworkBuilder ietfNetworkBldr = new NetworkBuilder().setNetworkId(new NetworkId("openroadm-topology")) - .setNode(ietfNodeList).addAugmentation(Network1.class, openroadmAugmToIetfNetwork); - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network - openroadmTopology; - openroadmTopology = ietfNetworkBldr.build(); - return openroadmTopology; + // openroadm Topology builder + NetworkBuilder ietfNetworkBldr = new NetworkBuilder() + .setNetworkId(new NetworkId("openroadm-topology")) + .setNode(ietfNodeList) + .addAugmentation(Network1.class, openroadmAugmToIetfNetwork); + + return ietfNetworkBldr.build(); } public static Mapping getMapping1() { @@ -219,9 +229,9 @@ public final class OlmTransactionUtils { List measurementListA = new ArrayList<>(); measurementListA.add(measurementA); CurrentPm cpA = new CurrentPmBuilder() - .setType(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum.OpticalPowerOutput) - .setMeasurement(measurementListA) - .build(); + .setType(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum.OpticalPowerOutput) + .setMeasurement(measurementListA) + .build(); List currentPmListA = new ArrayList<>(); currentPmListA.add(cpA); InstanceIdentifier interfaceIIDA = InstanceIdentifier.create(OrgOpenroadmDevice.class) @@ -230,7 +240,7 @@ public final class OlmTransactionUtils { .setCurrentPm(currentPmListA) .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(); @@ -248,9 +258,9 @@ public final class OlmTransactionUtils { List measurementListC = new ArrayList<>(); measurementListC.add(measurementC); CurrentPm cpC = new CurrentPmBuilder() - .setType(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum.OpticalPowerInput) - .setMeasurement(measurementListC) - .build(); + .setType(org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.PmNamesEnum.OpticalPowerInput) + .setMeasurement(measurementListC) + .build(); List currentPmListC = new ArrayList<>(); currentPmListC.add(cpC); InstanceIdentifier interfaceIIDC = InstanceIdentifier.create(OrgOpenroadmDevice.class) @@ -259,7 +269,7 @@ public final class OlmTransactionUtils { .setCurrentPm(currentPmListC) .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(); @@ -267,4 +277,4 @@ public final class OlmTransactionUtils { currentPmEntryListC.add(currentPmEntryC); return Optional.of(new CurrentPmListBuilder().setCurrentPmEntry(currentPmEntryListC).build()); } -} \ No newline at end of file +}