X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Futil%2FOlmUtils710.java;h=15303d7290175e9d0cc2609f674c321292713ed4;hb=refs%2Fchanges%2F46%2F100646%2F27;hp=02dac7345a385297aeabffe0fca88027ddf5e9dc;hpb=8bd6a578259937ace638f1ee93a62749ad1a8ca4;p=transportpce.git diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils710.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils710.java index 02dac7345..15303d729 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils710.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils710.java @@ -18,10 +18,11 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.MeasurementsBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.GetPmOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.MeasurementsBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.OrgOpenroadmDeviceData; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.Ports; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.PortsKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.packs.CircuitPacks; @@ -47,10 +48,10 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev200529.current.pm.l import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev200529.current.pm.list.CurrentPmEntryKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev200529.current.pm.val.group.Measurement; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.Direction; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.Location; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.PmNamesEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.get.pm.input.ResourceIdentifier; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.Direction; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.Location; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.PmNamesEnum; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.olm.get.pm.input.ResourceIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; @@ -182,36 +183,57 @@ final class OlmUtils710 { ResourceIdentifier wantedResourceIdentifier) { switch (wantedResourceType) { case Device: - return InstanceIdentifier.create(OrgOpenroadmDevice.class); + return InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .build(); case Degree: - return InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Degree.class, new DegreeKey(Uint16.valueOf(wantedResourceIdentifier.getResourceName()))); + return InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Degree.class, new DegreeKey(Uint16.valueOf(wantedResourceIdentifier.getResourceName()))) + .build(); case SharedRiskGroup: - return InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(SharedRiskGroup.class, - new SharedRiskGroupKey(Uint16.valueOf(wantedResourceIdentifier.getResourceName()))); + return InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child( + SharedRiskGroup.class, + new SharedRiskGroupKey(Uint16.valueOf(wantedResourceIdentifier.getResourceName()))) + .build(); case Connection: - return InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(RoadmConnections.class, new RoadmConnectionsKey(wantedResourceIdentifier.getResourceName())); + return InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(RoadmConnections.class, new RoadmConnectionsKey(wantedResourceIdentifier.getResourceName())) + .build(); case CircuitPack: - return InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(CircuitPacks.class, new CircuitPacksKey(wantedResourceIdentifier.getResourceName())); + return InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(wantedResourceIdentifier.getResourceName())) + .build(); case Port: - return InstanceIdentifier.create(OrgOpenroadmDevice.class) + return InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(wantedResourceIdentifier.getCircuitPackName())) - .child(Ports.class, new PortsKey(wantedResourceIdentifier.getResourceName())); + .child(Ports.class, new PortsKey(wantedResourceIdentifier.getResourceName())) + .build(); case Interface: - return InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Interface.class, new InterfaceKey(wantedResourceIdentifier.getResourceName())); + return InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey(wantedResourceIdentifier.getResourceName())) + .build(); case InternalLink: - return InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(InternalLink.class, new InternalLinkKey(wantedResourceIdentifier.getResourceName())); + return InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(InternalLink.class, new InternalLinkKey(wantedResourceIdentifier.getResourceName())) + .build(); case PhysicalLink: - return InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(PhysicalLink.class, new PhysicalLinkKey(wantedResourceIdentifier.getResourceName())); + return InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(PhysicalLink.class, new PhysicalLinkKey(wantedResourceIdentifier.getResourceName())) + .build(); case Shelf: - return InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Shelves.class, new ShelvesKey(wantedResourceIdentifier.getResourceName())); + return InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Shelves.class, new ShelvesKey(wantedResourceIdentifier.getResourceName())) + .build(); default: LOG.error("Unknown resource type {}", wantedResourceType); return null;