From f3e348263b4ad6f3ca1a7def9d6a251f394ea4ec Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Fri, 18 Dec 2015 00:31:39 +0800 Subject: [PATCH] Change logical-switch-ref to iid in hwvtep.yang Change the type of logical-switch-ref from string to instance-identifier in hwvtep.yang PatchSet 2: 1. fix logical-switch-ref in postman collection Change-Id: I67fc5f80ac0fea88ed3f6ac7eaeeee9e63f0da92 Signed-off-by: Peng Zhang --- .../src/main/yang/hwvtep.yang | 2 +- .../transact/HwvtepOperationalState.java | 5 +++++ .../transact/McastMacsLocalUpdateCommand.java | 15 +++++++------- .../McastMacsRemoteRemoveCommand.java | 6 ------ .../McastMacsRemoteUpdateCommand.java | 15 +++++++------- .../transact/PhysicalPortRemoveCommand.java | 3 --- .../transact/PhysicalPortUpdateCommand.java | 8 ++++---- .../transact/PhysicalSwitchUpdateCommand.java | 1 - .../transact/TransactUtils.java | 1 - .../transact/UcastMacsLocalUpdateCommand.java | 13 ++++++------ .../UcastMacsRemoteUpdateCommand.java | 13 ++++++------ .../md/McastMacsLocalUpdateCommand.java | 5 ++++- .../md/McastMacsRemoteUpdateCommand.java | 5 ++++- .../md/PhysicalPortUpdateCommand.java | 8 ++++++-- .../md/UcastMacsLocalUpdateCommand.java | 5 ++++- .../md/UcastMacsRemoteUpdateCommand.java | 5 ++++- ...thbound-Collection.json.postman_collection | 20 +++++++++---------- 17 files changed, 70 insertions(+), 60 deletions(-) diff --git a/hwvtepsouthbound/hwvtepsouthbound-api/src/main/yang/hwvtep.yang b/hwvtepsouthbound/hwvtepsouthbound-api/src/main/yang/hwvtep.yang index caa94ec39..0f899f058 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-api/src/main/yang/hwvtep.yang +++ b/hwvtepsouthbound/hwvtepsouthbound-api/src/main/yang/hwvtep.yang @@ -20,7 +20,7 @@ module hwvtep { typedef hwvtep-logical-switch-ref { description "A reference to a logical switch in hwvtep based switches"; - type hwvtep-node-name; + type instance-identifier; } typedef hwvtep-physical-locator-ref { diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java index e3ad78a43..09608dfd9 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/HwvtepOperationalState.java @@ -259,6 +259,11 @@ public class HwvtepOperationalState { } return Optional.absent(); } + + public Optional getLogicalSwitches(InstanceIdentifier iid) { + Optional lswitch = HwvtepSouthboundUtil.readNode(transaction, iid); + return lswitch; + } public ReadWriteTransaction getReadWriteTransaction() { return transaction; diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java index e9fd55c8d..f735ae0e1 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java @@ -25,10 +25,8 @@ import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils; import org.opendaylight.ovsdb.schema.hardwarevtep.McastMacsLocal; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepNodeName; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LocalMcastMacs; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitches; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitchesKey; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; @@ -73,7 +71,7 @@ public class McastMacsLocalUpdateCommand extends AbstractTransactCommand { McastMacsLocal mcastMacsLocal = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), McastMacsLocal.class); setIpAddress(mcastMacsLocal, localMcastMac); setLocatorSet(transaction, mcastMacsLocal, localMcastMac); - setLogicalSwitch(instanceIdentifier, mcastMacsLocal, localMcastMac); + setLogicalSwitch(mcastMacsLocal, localMcastMac); if (!operationalMacOptional.isPresent()) { setMac(mcastMacsLocal, localMcastMac, operationalMacOptional); transaction.add(op.insert(mcastMacsLocal)); @@ -89,18 +87,19 @@ public class McastMacsLocalUpdateCommand extends AbstractTransactCommand { } } - private void setLogicalSwitch(InstanceIdentifier iid, McastMacsLocal mcastMacsLocal, LocalMcastMacs inputMac) { + private void setLogicalSwitch(McastMacsLocal mcastMacsLocal, LocalMcastMacs inputMac) { if (inputMac.getLogicalSwitchRef() != null) { - HwvtepNodeName lswitchName = new HwvtepNodeName(inputMac.getLogicalSwitchRef().getValue()); + @SuppressWarnings("unchecked") + InstanceIdentifier lswitchIid = (InstanceIdentifier) inputMac.getLogicalSwitchRef().getValue(); Optional operationalSwitchOptional = - getOperationalState().getLogicalSwitches(iid, new LogicalSwitchesKey(lswitchName)); + getOperationalState().getLogicalSwitches(lswitchIid); if (operationalSwitchOptional.isPresent()) { Uuid logicalSwitchUuid = operationalSwitchOptional.get().getLogicalSwitchUuid(); UUID logicalSwitchUUID = new UUID(logicalSwitchUuid.getValue()); mcastMacsLocal.setLogicalSwitch(logicalSwitchUUID); } else { - LOG.warn("Create or update localMcastMac: No logical switch named {} found in operational datastore!", - lswitchName); + LOG.warn("Create or update localMcastMac: No logical switch with iid {} found in operational datastore!", + lswitchIid); } } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java index 0cf58a630..2c0e8d55d 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java @@ -20,18 +20,12 @@ import java.util.Map.Entry; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundConstants; -import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.lib.operations.TransactionBuilder; import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils; import org.opendaylight.ovsdb.schema.hardwarevtep.McastMacsRemote; -import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocator; -import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocatorSet; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.RemoteMcastMacs; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical.locator.set.attributes.LocatorSet; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteUpdateCommand.java index 1afc244f5..23938eaff 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteUpdateCommand.java @@ -25,9 +25,7 @@ import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils; import org.opendaylight.ovsdb.schema.hardwarevtep.McastMacsRemote; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepNodeName; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitches; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitchesKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.RemoteMcastMacs; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -73,7 +71,7 @@ public class McastMacsRemoteUpdateCommand extends AbstractTransactCommand { McastMacsRemote mcastMacsRemote = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), McastMacsRemote.class); setIpAddress(mcastMacsRemote, mac); setLocatorSet(transaction, mcastMacsRemote, mac); - setLogicalSwitch(instanceIdentifier, mcastMacsRemote, mac); + setLogicalSwitch(mcastMacsRemote, mac); if (!operationalMacOptional.isPresent()) { setMac(mcastMacsRemote, mac, operationalMacOptional); transaction.add(op.insert(mcastMacsRemote)); @@ -89,18 +87,19 @@ public class McastMacsRemoteUpdateCommand extends AbstractTransactCommand { } } - private void setLogicalSwitch(InstanceIdentifier iid, McastMacsRemote mcastMacsRemote, RemoteMcastMacs inputMac) { + private void setLogicalSwitch(McastMacsRemote mcastMacsRemote, RemoteMcastMacs inputMac) { if (inputMac.getLogicalSwitchRef() != null) { - HwvtepNodeName lswitchName = new HwvtepNodeName(inputMac.getLogicalSwitchRef().getValue()); + @SuppressWarnings("unchecked") + InstanceIdentifier lswitchIid = (InstanceIdentifier) inputMac.getLogicalSwitchRef().getValue(); Optional operationalSwitchOptional = - getOperationalState().getLogicalSwitches(iid, new LogicalSwitchesKey(lswitchName)); + getOperationalState().getLogicalSwitches(lswitchIid); if (operationalSwitchOptional.isPresent()) { Uuid logicalSwitchUuid = operationalSwitchOptional.get().getLogicalSwitchUuid(); UUID logicalSwitchUUID = new UUID(logicalSwitchUuid.getValue()); mcastMacsRemote.setLogicalSwitch(logicalSwitchUUID); } else { - LOG.warn("Create or update remoteMcastMac: NO logical switch named {} found in operational datastore!", - lswitchName); + LOG.warn("Create or update remoteMcastMac: NO logical switch with iid {} found in operational datastore!", + lswitchIid); } } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java index 1e046ca52..38cfae9ec 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java @@ -19,16 +19,13 @@ import java.util.Map.Entry; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; -import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundMapper; import org.opendaylight.ovsdb.lib.notation.Mutator; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.lib.operations.TransactionBuilder; import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils; -import org.opendaylight.ovsdb.schema.hardwarevtep.Global; import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalPort; import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalSwitch; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalPortAugmentation; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.PhysicalSwitchAugmentation; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortUpdateCommand.java index aff805cca..00376a46b 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortUpdateCommand.java @@ -27,11 +27,9 @@ import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils; import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalPort; import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalSwitch; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepNodeName; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalPortAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.PhysicalSwitchAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitches; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitchesKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical.port.attributes.VlanBindings; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; @@ -151,9 +149,11 @@ public class PhysicalPortUpdateCommand extends AbstractTransactCommand { //get UUID by LogicalSwitchRef Map bindingMap = new HashMap(); for (VlanBindings vlanBinding: inputPhysicalPort.getVlanBindings()) { - HwvtepNodeName lswitchName = new HwvtepNodeName(vlanBinding.getLogicalSwitchRef().getValue()); + @SuppressWarnings("unchecked") + InstanceIdentifier lswitchIid = + (InstanceIdentifier) vlanBinding.getLogicalSwitchRef().getValue(); Optional operationalSwitchOptional = - getOperationalState().getLogicalSwitches(globalNodeIid, new LogicalSwitchesKey(lswitchName)); + getOperationalState().getLogicalSwitches(lswitchIid); if (operationalSwitchOptional.isPresent()) { Uuid logicalSwitchUuid = operationalSwitchOptional.get().getLogicalSwitchUuid(); bindingMap.put(vlanBinding.getVlanIdKey().getValue().longValue(), new UUID(logicalSwitchUuid.getValue())); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java index ef6b09f57..86ad47334 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java @@ -29,7 +29,6 @@ import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalSwitch; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.PhysicalSwitchAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical._switch.attributes.ManagementIps; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical._switch.attributes.TunnelIps; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical._switch.attributes.Tunnels; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactUtils.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactUtils.java index ea74000d7..1add473e0 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactUtils.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/TransactUtils.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java index ee1106b33..52d212c21 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java @@ -74,7 +74,7 @@ public class UcastMacsLocalUpdateCommand extends AbstractTransactCommand { UcastMacsLocal ucastMacsLocal = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), UcastMacsLocal.class); setIpAddress(ucastMacsLocal, localUcastMac); setLocator(transaction, ucastMacsLocal, localUcastMac); - setLogicalSwitch(instanceIdentifier, ucastMacsLocal, localUcastMac); + setLogicalSwitch(ucastMacsLocal, localUcastMac); if (!operationalMacOptional.isPresent()) { setMac(ucastMacsLocal, localUcastMac, operationalMacOptional); transaction.add(op.insert(ucastMacsLocal)); @@ -90,18 +90,19 @@ public class UcastMacsLocalUpdateCommand extends AbstractTransactCommand { } } - private void setLogicalSwitch(InstanceIdentifier iid, UcastMacsLocal ucastMacsLocal, LocalUcastMacs inputMac) { + private void setLogicalSwitch(UcastMacsLocal ucastMacsLocal, LocalUcastMacs inputMac) { if (inputMac.getLogicalSwitchRef() != null) { - HwvtepNodeName lswitchName = new HwvtepNodeName(inputMac.getLogicalSwitchRef().getValue()); + @SuppressWarnings("unchecked") + InstanceIdentifier lswitchIid = (InstanceIdentifier) inputMac.getLogicalSwitchRef().getValue(); Optional operationalSwitchOptional = - getOperationalState().getLogicalSwitches(iid, new LogicalSwitchesKey(lswitchName)); + getOperationalState().getLogicalSwitches(lswitchIid); if (operationalSwitchOptional.isPresent()) { Uuid logicalSwitchUuid = operationalSwitchOptional.get().getLogicalSwitchUuid(); UUID logicalSwitchUUID = new UUID(logicalSwitchUuid.getValue()); ucastMacsLocal.setLogicalSwitch(logicalSwitchUUID); } else { - LOG.warn("Create or update localUcastMacs: No logical switch named {} found in operational datastore!", - lswitchName); + LOG.warn("Create or update localUcastMacs: No logical switch with iid {} found in operational datastore!", + lswitchIid); } } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteUpdateCommand.java index 2de4177ea..227608c2c 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteUpdateCommand.java @@ -74,7 +74,7 @@ public class UcastMacsRemoteUpdateCommand extends AbstractTransactCommand { UcastMacsRemote ucastMacsRemote = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), UcastMacsRemote.class); setIpAddress(ucastMacsRemote, remoteUcastMac); setLocator(transaction, ucastMacsRemote, remoteUcastMac); - setLogicalSwitch(instanceIdentifier, ucastMacsRemote, remoteUcastMac); + setLogicalSwitch(ucastMacsRemote, remoteUcastMac); if (!operationalMacOptional.isPresent()) { setMac(ucastMacsRemote, remoteUcastMac, operationalMacOptional); transaction.add(op.insert(ucastMacsRemote)); @@ -90,18 +90,19 @@ public class UcastMacsRemoteUpdateCommand extends AbstractTransactCommand { } } - private void setLogicalSwitch(InstanceIdentifier iid, UcastMacsRemote ucastMacsRemote, RemoteUcastMacs inputMac) { + private void setLogicalSwitch(UcastMacsRemote ucastMacsRemote, RemoteUcastMacs inputMac) { if (inputMac.getLogicalSwitchRef() != null) { - HwvtepNodeName lswitchName = new HwvtepNodeName(inputMac.getLogicalSwitchRef().getValue()); + @SuppressWarnings("unchecked") + InstanceIdentifier lswitchIid = (InstanceIdentifier) inputMac.getLogicalSwitchRef().getValue(); Optional operationalSwitchOptional = - getOperationalState().getLogicalSwitches(iid, new LogicalSwitchesKey(lswitchName)); + getOperationalState().getLogicalSwitches(lswitchIid); if (operationalSwitchOptional.isPresent()) { Uuid logicalSwitchUuid = operationalSwitchOptional.get().getLogicalSwitchUuid(); UUID logicalSwitchUUID = new UUID(logicalSwitchUuid.getValue()); ucastMacsRemote.setLogicalSwitch(logicalSwitchUUID); } else { - LOG.warn("Create or update remoteUcastMac: No logical switch named {} found in operational datastore!", - lswitchName); + LOG.warn("Create or update remoteUcastMac: No logical switch with iid {} found in operational datastore!", + lswitchIid); } } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/McastMacsLocalUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/McastMacsLocalUpdateCommand.java index 6ddd4340e..252047ba0 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/McastMacsLocalUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/McastMacsLocalUpdateCommand.java @@ -37,6 +37,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hw import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LocalMcastMacs; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LocalMcastMacsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitches; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical.locator.set.attributes.LocatorSet; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical.locator.set.attributes.LocatorSetBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; @@ -103,7 +104,9 @@ public class McastMacsLocalUpdateCommand extends AbstractTransactionCommand { UUID lsUUID = mMacLocal.getLogicalSwitchColumn().getData(); LogicalSwitch lSwitch = updatedLSRows.get(lsUUID); if (lSwitch != null) { - mMacLocalBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(lSwitch.getName())); + InstanceIdentifier lSwitchIid = + HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), lSwitch); + mMacLocalBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(lSwitchIid)); } } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/McastMacsRemoteUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/McastMacsRemoteUpdateCommand.java index cfc48ede5..631f1c7be 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/McastMacsRemoteUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/McastMacsRemoteUpdateCommand.java @@ -35,6 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hw import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepLogicalSwitchRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorRef; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitches; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.RemoteMcastMacs; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.RemoteMcastMacsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical.locator.set.attributes.LocatorSet; @@ -103,7 +104,9 @@ public class McastMacsRemoteUpdateCommand extends AbstractTransactionCommand { UUID lsUUID = mMacRemote.getLogicalSwitchColumn().getData(); LogicalSwitch lSwitch = updatedLSRows.get(lsUUID); if (lSwitch != null) { - mMacRemoteBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(lSwitch.getName())); + InstanceIdentifier lSwitchIid = + HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), lSwitch); + mMacRemoteBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(lSwitchIid)); } } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/PhysicalPortUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/PhysicalPortUpdateCommand.java index b044b548e..38337de16 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/PhysicalPortUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/PhysicalPortUpdateCommand.java @@ -32,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hw import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepNodeName; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalPortAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalPortAugmentationBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitches; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.Switches; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical.port.attributes.VlanBindings; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical.port.attributes.VlanBindingsBuilder; @@ -179,8 +180,11 @@ public class PhysicalPortUpdateCommand extends AbstractTransactionCommand { } private HwvtepLogicalSwitchRef getLogicalSwitchRef(UUID switchUUID) { - if (lSwitchUpdatedRows.get(switchUUID) != null) { - return new HwvtepLogicalSwitchRef(lSwitchUpdatedRows.get(switchUUID).getName()); + LogicalSwitch logicalSwitch = lSwitchUpdatedRows.get(switchUUID); + if (logicalSwitch != null) { + InstanceIdentifier lSwitchIid = + HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), logicalSwitch); + return new HwvtepLogicalSwitchRef(lSwitchIid); } return null; } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/UcastMacsLocalUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/UcastMacsLocalUpdateCommand.java index 81d63c599..73dbfdc05 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/UcastMacsLocalUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/UcastMacsLocalUpdateCommand.java @@ -32,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hw import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LocalUcastMacs; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LocalUcastMacsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitches; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; @@ -92,7 +93,9 @@ public class UcastMacsLocalUpdateCommand extends AbstractTransactionCommand { UUID lsUUID = ucml.getLogicalSwitchColumn().getData(); LogicalSwitch logicalSwitch = updatedLSRows.get(lsUUID); if (logicalSwitch != null) { - ucmlBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(logicalSwitch.getName())); + InstanceIdentifier lSwitchIid = + HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), logicalSwitch); + ucmlBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(lSwitchIid)); } } List umclList = new ArrayList<>(); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/UcastMacsRemoteUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/UcastMacsRemoteUpdateCommand.java index 3f48d8a42..7ebe81a2e 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/UcastMacsRemoteUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/UcastMacsRemoteUpdateCommand.java @@ -30,6 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hw import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepLogicalSwitchRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorRef; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitches; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.RemoteUcastMacs; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.RemoteUcastMacsBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; @@ -95,7 +96,9 @@ public class UcastMacsRemoteUpdateCommand extends AbstractTransactionCommand { UUID lsUUID = uMacRemote.getLogicalSwitchColumn().getData(); final LogicalSwitch logicalSwitch = updatedLSRows.get(lsUUID); if (logicalSwitch != null) { - rumBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(logicalSwitch.getName())); + InstanceIdentifier lSwitchIid = + HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), logicalSwitch); + rumBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(lSwitchIid)); } } remoteUMacs.add(rumBuilder.build()); diff --git a/resources/commons/Ovsdb-HwvtepSouthbound-Collection.json.postman_collection b/resources/commons/Ovsdb-HwvtepSouthbound-Collection.json.postman_collection index e6831da3d..d72f2406e 100755 --- a/resources/commons/Ovsdb-HwvtepSouthbound-Collection.json.postman_collection +++ b/resources/commons/Ovsdb-HwvtepSouthbound-Collection.json.postman_collection @@ -356,7 +356,7 @@ "time": 1448641495086, "name": "Create Specific Config Physical Port", "description": "", - "rawModeData": "{\n \"network-topology:termination-point\": [\n {\n \"tp-id\": \"port0\",\n \t\"hwvtep-node-name\": \"port0\",\n \"hwvtep-node-description\": \"\",\n \"vlan-bindings\": [\n \t\t{\n \"vlan-id-key\": \"100\",\n \"logical-switch-ref\": \"ls0\"\n \t}\n \t]\n\t\t}\n ]\n}" + "rawModeData": "{\n \"network-topology:termination-point\": [\n {\n \"tp-id\": \"port0\",\n \t\"hwvtep-node-name\": \"port0\",\n \"hwvtep-node-description\": \"\",\n \"vlan-bindings\": [\n \t\t{\n \"vlan-id-key\": \"100\",\n \"logical-switch-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/hwvtep:logical-switches[hwvtep:hwvtep-node-name='ls0']\"\n \t}\n \t]\n\t\t}\n ]\n}" }, { "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8", @@ -375,7 +375,7 @@ "time": 1448643757985, "name": "Update Specific Config Physical Port", "description": "", - "rawModeData": "{\n \"network-topology:termination-point\": [\n {\n \"tp-id\": \"port0\",\n \t\"hwvtep-node-name\": \"port0\",\n \"hwvtep-node-description\": \"\",\n \"vlan-bindings\": [\n \t\t{\n \"vlan-id-key\": \"100\",\n \"logical-switch-ref\": \"ls0\"\n \t}\n \t]\n\t\t}\n ]\n}" + "rawModeData": "{\n \"network-topology:termination-point\": [\n {\n \"tp-id\": \"port0\",\n \t\"hwvtep-node-name\": \"port0\",\n \"hwvtep-node-description\": \"\",\n \"vlan-bindings\": [\n \t\t{\n \"vlan-id-key\": \"100\",\n \"logical-switch-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/hwvtep:logical-switches[hwvtep:hwvtep-node-name='ls0']\"\n \t}\n \t]\n\t\t}\n ]\n}" }, { "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8", @@ -449,7 +449,7 @@ "time": 1449132978312, "name": "Create Specific Config UcastMacRemote", "description": "", - "rawModeData": "{\n \"remote-ucast-macs\": [\n {\n \"mac-entry-key\": \"11:11:11:11:11:11\",\n \"logical-switch-ref\": \"ls0\",\n \"ipaddr\": \"1.1.1.1\",\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{LocatorIp}}']\" \n }\n ]\n}" + "rawModeData": "{\n \"remote-ucast-macs\": [\n {\n \"mac-entry-key\": \"11:11:11:11:11:11\",\n \"logical-switch-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/hwvtep:logical-switches[hwvtep:hwvtep-node-name='ls0']\",\n \"ipaddr\": \"1.1.1.1\",\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{LocatorIp}}']\" \n }\n ]\n}" }, { "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8", @@ -468,7 +468,7 @@ "time": 1449310821724, "name": "Update Specific Config UcastMacRemote", "description": "", - "rawModeData": "{\n \"remote-ucast-macs\": [\n {\n \"mac-entry-key\": \"11:11:11:11:11:11\",\n \"logical-switch-ref\": \"ls0\",\n \"ipaddr\": \"1.1.1.1\",\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{LocatorIp}}']\"\n }\n ]\n}" + "rawModeData": "{\n \"remote-ucast-macs\": [\n {\n \"mac-entry-key\": \"11:11:11:11:11:11\",\n \"logical-switch-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/hwvtep:logical-switches[hwvtep:hwvtep-node-name='ls0']\",\n \"ipaddr\": \"1.1.1.1\",\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{LocatorIp}}']\"\n }\n ]\n}" }, { "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8", @@ -561,7 +561,7 @@ "time": 1449286080233, "name": "Create Specific Config UcastMacLocal", "description": "", - "rawModeData": "{\n \"local-ucast-macs\": [\n {\n \"mac-entry-key\": \"22:22:22:22:22:22\",\n \"logical-switch-ref\": \"ls0\",\n \"ipaddr\": \"2.2.2.2\",\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{LocatorIp}}']\" \n }\n ]\n}" + "rawModeData": "{\n \"local-ucast-macs\": [\n {\n \"mac-entry-key\": \"22:22:22:22:22:22\",\n \"logical-switch-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/hwvtep:logical-switches[hwvtep:hwvtep-node-name='ls0']\",\n \"ipaddr\": \"2.2.2.2\",\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{LocatorIp}}']\" \n }\n ]\n}" }, { "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8", @@ -580,7 +580,7 @@ "time": 1449310498424, "name": "Update Specific Config UcastMacLocal", "description": "", - "rawModeData": "{\n \"local-ucast-macs\": [\n {\n \"mac-entry-key\": \"22:22:22:22:22:22\",\n \"logical-switch-ref\": \"ls0\",\n \"ipaddr\": \"2.2.2.2\",\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{LocatorIp}}']\"\n }\n ]\n}" + "rawModeData": "{\n \"local-ucast-macs\": [\n {\n \"mac-entry-key\": \"22:22:22:22:22:22\",\n \"logical-switch-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/hwvtep:logical-switches[hwvtep:hwvtep-node-name='ls0']\",\n \"ipaddr\": \"2.2.2.2\",\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{LocatorIp}}']\"\n }\n ]\n}" }, { "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8", @@ -654,7 +654,7 @@ "time": 1449468092415, "name": "Create Specific Config McastMacRemote", "description": "", - "rawModeData": "{\n \"remote-mcast-macs\": [\n {\n \"mac-entry-key\": \"33:33:33:33:33:55\",\n \"logical-switch-ref\": \"ls0\",\n \"ipaddr\": \"3.3.3.5\",\n \"locator-set\": [\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-1}}']\"\n },\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-2}}']\"\n }\n ]\n }\n ]\n}" + "rawModeData": "{\n \"remote-mcast-macs\": [\n {\n \"mac-entry-key\": \"33:33:33:33:33:55\",\n \"logical-switch-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/hwvtep:logical-switches[hwvtep:hwvtep-node-name='ls0']\",\n \"ipaddr\": \"3.3.3.5\",\n \"locator-set\": [\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-1}}']\"\n },\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-2}}']\"\n }\n ]\n }\n ]\n}" }, { "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8", @@ -673,7 +673,7 @@ "time": 1449468318065, "name": "Update Specific Config McastMacRemote ", "description": "", - "rawModeData": "{\n \"remote-mcast-macs\": [\n {\n \"mac-entry-key\": \"33:33:33:33:33:33\",\n \"logical-switch-ref\": \"ls1\",\n \"ipaddr\": \"3.3.3.3\",\n \"locator-set\": [\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-1}}']\"\n },\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-2}}']\"\n }\n ]\n }\n ]\n}" + "rawModeData": "{\n \"remote-mcast-macs\": [\n {\n \"mac-entry-key\": \"33:33:33:33:33:33\",\n \"logical-switch-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/hwvtep:logical-switches[hwvtep:hwvtep-node-name='ls0']\",\n \"ipaddr\": \"3.3.3.3\",\n \"locator-set\": [\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-1}}']\"\n },\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-2}}']\"\n }\n ]\n }\n ]\n}" }, { "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8", @@ -748,7 +748,7 @@ "time": 1449468010690, "name": "Create Specific Config McastMacLocal", "description": "", - "rawModeData": "{\n \"local-mcast-macs\": [\n {\n \"mac-entry-key\": \"44:44:44:44:44:66\",\n \"logical-switch-ref\": \"ls0\",\n \"ipaddr\": \"4.4.4.6\",\n \"locator-set\": [\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-1}}']\"\n },\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-2}}']\"\n }\n ]\n }\n ]\n}" + "rawModeData": "{\n \"local-mcast-macs\": [\n {\n \"mac-entry-key\": \"44:44:44:44:44:66\",\n \"logical-switch-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/hwvtep:logical-switches[hwvtep:hwvtep-node-name='ls0']\",\n \"ipaddr\": \"4.4.4.6\",\n \"locator-set\": [\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-1}}']\"\n },\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-2}}']\"\n }\n ]\n }\n ]\n}" }, { "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8", @@ -767,7 +767,7 @@ "time": 1449468504628, "name": "Update Specific Config McastMacLocal", "description": "", - "rawModeData": "{\n \"local-mcast-macs\": [\n {\n \"mac-entry-key\": \"44:44:44:44:44:44\",\n \"logical-switch-ref\": \"ls0\",\n \"ipaddr\": \"4.4.4.4\",\n \"locator-set\": [\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-1}}']\"\n },\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-2}}']\"\n }\n ]\n }\n ]\n}" + "rawModeData": "{\n \"local-mcast-macs\": [\n {\n \"mac-entry-key\": \"44:44:44:44:44:44\",\n \"logical-switch-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/hwvtep:logical-switches[hwvtep:hwvtep-node-name='ls0']\",\n \"ipaddr\": \"4.4.4.4\",\n \"locator-set\": [\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-1}}']\"\n },\n {\n \"locator-ref\": \"/network-topology:network-topology/network-topology:topology[network-topology:topology-id='hwvtep:1']/network-topology:node[network-topology:node-id='hwvtep://{{hwvtepNodeIp}}:6640']/network-topology:termination-point[network-topology:tp-id='vxlan_over_ipv4:{{locatorIp-2}}']\"\n }\n ]\n }\n ]\n}" }, { "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8", -- 2.36.6