private static InstanceIdentifier<Node> createInstanceIdentifier(IpAddress ip, PortNumber port) {
String uriString = HwvtepSouthboundConstants.HWVTEP_URI_PREFIX + "://"
- + String.valueOf(ip.getValue()) + ":" + port.getValue();
+ + ip.stringValue() + ":" + port.getValue();
Uri uri = new Uri(uriString);
NodeId nodeId = new NodeId(uri);
InstanceIdentifier<Node> path = InstanceIdentifier.create(NetworkTopology.class)
}
public static String connectionInfoToString(final ConnectionInfo connectionInfo) {
- return String.valueOf(
- connectionInfo.getRemoteIp().getValue()) + ":" + connectionInfo.getRemotePort().getValue();
+ return connectionInfo.getRemoteIp().stringValue() + ":" + connectionInfo.getRemotePort().getValue();
}
getOperationalState().getAcls(aclIid);
if (operationalAclOptional.isPresent()) {
Uuid aclUuid = operationalAclOptional.get().getAclUuid();
- bindingMap.put(String.valueOf(aclBinding.getRouterInterface().getValue()),
+ bindingMap.put(aclBinding.getRouterInterface().stringValue(),
new UUID(aclUuid.getValue()));
} else {
- bindingMap.put(String.valueOf(aclBinding.getRouterInterface().getValue()),
+ bindingMap.put(aclBinding.getRouterInterface().stringValue(),
TransactUtils.getAclUUID(aclIid));
}
}
if (staticRoutes != null) {
Map<String, String> staticRoutesMap = new HashMap<>();
for (StaticRoutes staticRoute : staticRoutes) {
- staticRoutesMap.put(String.valueOf(staticRoute.getDestinationAddress().getValue()),
- String.valueOf(staticRoute.getNexthopAddress().getValue()));
+ staticRoutesMap.put(staticRoute.getDestinationAddress().stringValue(),
+ staticRoute.getNexthopAddress().stringValue());
}
logicalRouter.setStaticRoutes(staticRoutesMap);
}
import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocator;
import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocatorSet;
import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.EncapsulationTypeVxlanOverIpv4;
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.HwvtepPhysicalLocatorAugmentation;
builder.setEncapsulationType(EncapsulationTypeVxlanOverIpv4.class);
String tepKey = iid.firstKeyOf(TerminationPoint.class).getTpId().getValue();
String ip = tepKey.substring(tepKey.indexOf(":") + 1);
- builder.setDstIp(new IpAddress(ip.toCharArray()));
+ builder.setDstIp(IpAddressBuilder.getDefaultInstance(ip));
locatorAugmentation = builder.build();
locatorUuid = TransactUtils.createPhysicalLocator(transaction, locatorAugmentation);
operationalState.updateCurrentTxData(TerminationPoint.class, iid, locatorUuid);
}
return null;
}
- LogicalSwitchUpdateCommand cmd = new LogicalSwitchUpdateCommand(operationalState, Collections.EMPTY_LIST);
+ LogicalSwitchUpdateCommand cmd = new LogicalSwitchUpdateCommand(operationalState, Collections.emptyList());
MdsalUtils mdsalUtils = new MdsalUtils(operationalState.getDataBroker());
LogicalSwitches ls = mdsalUtils.read(LogicalDatastoreType.CONFIGURATION, lswitchIid);
if (ls != null) {
import org.opendaylight.ovsdb.schema.hardwarevtep.McastMacsLocal;
import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocator;
import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocatorSet;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
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;
private void setIpAddress(LocalMcastMacsBuilder macLocalBuilder, McastMacsLocal macLocal) {
if (macLocal.getIpAddr() != null && !macLocal.getIpAddr().isEmpty()) {
- macLocalBuilder.setIpaddr(new IpAddress(macLocal.getIpAddr().toCharArray()));
+ macLocalBuilder.setIpaddr(IpAddressBuilder.getDefaultInstance(macLocal.getIpAddr()));
}
}
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.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
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;
private void setIpAddress(RemoteMcastMacsBuilder macRemoteBuilder, McastMacsRemote macRemote) {
if (macRemote.getIpAddr() != null && !macRemote.getIpAddr().isEmpty()) {
- macRemoteBuilder.setIpaddr(new IpAddress(macRemote.getIpAddr().toCharArray()));
+ macRemoteBuilder.setIpaddr(IpAddressBuilder.getDefaultInstance(macRemote.getIpAddr()));
}
}
import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocator;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
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.HwvtepPhysicalLocatorAugmentation;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorAugmentationBuilder;
private void setDstIp(HwvtepPhysicalLocatorAugmentationBuilder tpAugmentationBuilder,
PhysicalLocator locator) {
- IpAddress ip = new IpAddress(locator.getDstIpColumn().getData().toCharArray());
- tpAugmentationBuilder.setDstIp(ip);
+ tpAugmentationBuilder.setDstIp(IpAddressBuilder.getDefaultInstance(locator.getDstIpColumn().getData()));
}
}
import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalSwitch;
import org.opendaylight.ovsdb.schema.hardwarevtep.Tunnel;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
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.HwvtepGlobalAugmentationBuilder;
}
}
- private InstanceIdentifier<TunnelIps> getTunnelIpIid(final String tunnelIp, final InstanceIdentifier<Node> psIid) {
- IpAddress ip = new IpAddress(tunnelIp.toCharArray());
+ private InstanceIdentifier<TunnelIps> getTunnelIpIid(final String tunnelIp,
+ final InstanceIdentifier<Node> psIid) {
+ IpAddress ip = IpAddressBuilder.getDefaultInstance(tunnelIp);
TunnelIps tunnelIps = new TunnelIpsBuilder().withKey(new TunnelIpsKey(ip)).setTunnelIpsKey(ip).build();
return psIid.augmentation(PhysicalSwitchAugmentation.class).child(TunnelIps.class, tunnelIps.key());
}
transaction.delete(LogicalDatastoreType.OPERATIONAL, tunnelIpsInstanceIdentifier);
}
for (String tunnelIp : addedTunnelIps) {
- IpAddress ip = new IpAddress(tunnelIp.toCharArray());
+ IpAddress ip = IpAddressBuilder.getDefaultInstance(tunnelIp);
InstanceIdentifier<TunnelIps> tunnelIpsInstanceIdentifier = getTunnelIpIid(tunnelIp, psIid);
TunnelIps tunnelIps = new TunnelIpsBuilder().withKey(new TunnelIpsKey(ip)).setTunnelIpsKey(ip).build();
transaction.put(LogicalDatastoreType.OPERATIONAL, tunnelIpsInstanceIdentifier, tunnelIps, true);
}
}
- private void setManagementIps(PhysicalSwitchAugmentationBuilder psAugmentationBuilder, PhysicalSwitch phySwitch) {
+ private void setManagementIps(PhysicalSwitchAugmentationBuilder psAugmentationBuilder,
+ PhysicalSwitch phySwitch) {
if (phySwitch.getManagementIpsColumn() != null && phySwitch.getManagementIpsColumn().getData() != null
&& !phySwitch.getManagementIpsColumn().getData().isEmpty()) {
List<ManagementIps> mgmtIps = new ArrayList<>();
for (String mgmtIp : phySwitch.getManagementIpsColumn().getData()) {
- IpAddress ip = new IpAddress(mgmtIp.toCharArray());
+ IpAddress ip = IpAddressBuilder.getDefaultInstance(mgmtIp);
mgmtIps.add(
new ManagementIpsBuilder().withKey(new ManagementIpsKey(ip)).setManagementIpsKey(ip).build());
}
import org.opendaylight.ovsdb.schema.hardwarevtep.LogicalSwitch;
import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocator;
import org.opendaylight.ovsdb.schema.hardwarevtep.UcastMacsLocal;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
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;
InstanceIdentifier<Node> nodeIid = getOvsdbConnectionInstance().getInstanceIdentifier();
LocalUcastMacsBuilder ucmlBuilder = new LocalUcastMacsBuilder();
if (ucml.getIpAddr() != null && !ucml.getIpAddr().isEmpty()) {
- ucmlBuilder.setIpaddr(new IpAddress(ucml.getIpAddr().toCharArray()));
+ ucmlBuilder.setIpaddr(IpAddressBuilder.getDefaultInstance(ucml.getIpAddr()));
}
ucmlBuilder.setMacEntryKey(new MacAddress(ucml.getMac()));
ucmlBuilder.setMacEntryUuid(new Uuid(ucml.getUuid().toString()));
import org.opendaylight.ovsdb.schema.hardwarevtep.LogicalSwitch;
import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocator;
import org.opendaylight.ovsdb.schema.hardwarevtep.UcastMacsRemote;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
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;
rumBuilder.setMacEntryKey(new MacAddress(macRemote.getMac()));
rumBuilder.setMacEntryUuid(new Uuid(macRemote.getUuid().toString()));
if (macRemote.getIpAddr() != null && !macRemote.getIpAddr().isEmpty()) {
- rumBuilder.setIpaddr(new IpAddress(macRemote.getIpAddr().toCharArray()));
+ rumBuilder.setIpaddr(IpAddressBuilder.getDefaultInstance(macRemote.getIpAddr()));
}
if (macRemote.getLocatorColumn() != null
&& macRemote.getLocatorColumn().getData() != null) {
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
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;
public static RemoteUcastMacs buildRemoteUcastMacs(InstanceIdentifier<Node> nodeIid, String vmMac,
String vmip, String tepIp, String logicalSwitchName) {
RemoteUcastMacsBuilder ucmlBuilder = new RemoteUcastMacsBuilder();
- ucmlBuilder.setIpaddr(new IpAddress(vmip.toCharArray()));
+ ucmlBuilder.setIpaddr(IpAddressBuilder.getDefaultInstance(vmip));
ucmlBuilder.setMacEntryKey(new MacAddress(vmMac));
ucmlBuilder.setMacEntryUuid(getUUid(vmMac));
ucmlBuilder.setLocatorRef(buildLocatorRef(nodeIid, tepIp));
new HwvtepPhysicalLocatorAugmentationBuilder();
tpAugmentationBuilder.setPhysicalLocatorUuid(getUUid(ip));
tpAugmentationBuilder.setEncapsulationType(HwvtepSouthboundMapper.createEncapsulationType(VXLAN_OVER_IPV4));
- tpAugmentationBuilder.setDstIp(new IpAddress(ip.toCharArray()));
+ tpAugmentationBuilder.setDstIp(IpAddressBuilder.getDefaultInstance(ip));
tpBuilder.addAugmentation(HwvtepPhysicalLocatorAugmentation.class, tpAugmentationBuilder.build());
}
return tpBuilder.build();
ConnectionInfo connectionInfo = ovsdbNodeAugmentation.getConnectionInfo();
LOG.info("connectionInfo: {}", connectionInfo);
if (connectionInfo != null && connectionInfo.getLocalIp() != null) {
- ipAddr = String.valueOf(connectionInfo.getLocalIp().getValue());
+ ipAddr = connectionInfo.getLocalIp().stringValue();
}
if (ipAddr == null) {
ipAddr = getLocalControllerHostIpAddress();
}
public static String connectionInfoToString(final ConnectionInfo connectionInfo) {
- return String.valueOf(
- connectionInfo.getRemoteIp().getValue()) + ":" + connectionInfo.getRemotePort().getValue();
+ return connectionInfo.getRemoteIp().stringValue() + ":" + connectionInfo.getRemotePort().getValue();
}
public static void schemaMismatchLog(String column, String table, SchemaVersionMismatchException ex) {
import org.opendaylight.ovsdb.southbound.SouthboundMapper;
import org.opendaylight.ovsdb.southbound.SouthboundUtil;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
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.rev150105.DatapathId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
IpAddress bridgeControllerIpAddress = null;
for (String targetElement : controllerTarget) {
if (InetAddresses.isInetAddress(targetElement)) {
- bridgeControllerIpAddress = new IpAddress(targetElement.toCharArray());
+ bridgeControllerIpAddress = IpAddressBuilder.getDefaultInstance(targetElement);
continue;
}
if (NumberUtils.isNumber(targetElement)) {
return nodeKey.getNodeId();
}
+ @Override
public void onSuccess() {
for (InstanceIdentifier<Node> updatedBridge : updatedBridges) {
LOG.debug("Updated bridge {} in operational datastore", updatedBridge);
}
}
+ @Override
public void onFailure(Throwable throwable) {
for (InstanceIdentifier<Node> updatedBridge : updatedBridges) {
LOG.error("Failed to update bridge {} in operational datastore", updatedBridge);
public static NodeId createNodeId(IpAddress ip, PortNumber port) {
String uriString = HwvtepSouthboundConstants.HWVTEP_URI_PREFIX + "://"
- + String.valueOf(ip.getValue()) + ":" + port.getValue();
+ + ip.stringValue() + ":" + port.getValue();
Uri uri = new Uri(uriString);
return new NodeId(uri);
}
}
public static Object connectionInfoToString(ConnectionInfo connectionInfo) {
- return String.valueOf(
- connectionInfo.getRemoteIp().getValue()) + ":" + connectionInfo.getRemotePort().getValue();
+ return connectionInfo.getRemoteIp().stringValue() + ":" + connectionInfo.getRemotePort().getValue();
}
}
.build();
public static NodeId createNodeId(IpAddress ip, PortNumber port) {
- String uriString = OVSDB_URI_PREFIX + "://"
- + String.valueOf(ip.getValue()) + ":" + port.getValue();
+ String uriString = OVSDB_URI_PREFIX + "://" + ip.stringValue() + ":" + port.getValue();
Uri uri = new Uri(uriString);
return new NodeId(uri);
}
}
public static String connectionInfoToString(final ConnectionInfo connectionInfo) {
- return String.valueOf(
- connectionInfo.getRemoteIp().getValue()) + ":" + connectionInfo.getRemotePort().getValue();
+ return connectionInfo.getRemoteIp().stringValue() + ":" + connectionInfo.getRemotePort().getValue();
}
public boolean addOvsdbNode(final ConnectionInfo connectionInfo) {
} else if (tokens[0].equalsIgnoreCase("ptcp")) {
ConnectionInfo connectionInfo = ovsdbNodeAugmentation.getConnectionInfo();
if (connectionInfo != null && connectionInfo.getLocalIp() != null) {
- controllerIpStr = String.valueOf(connectionInfo.getLocalIp().getValue());
+ controllerIpStr = connectionInfo.getLocalIp().stringValue();
controllersStr.add(OPENFLOW_CONNECTION_PROTOCOL
+ ":" + controllerIpStr + ":" + OPENFLOW_PORT);
} else {
} else if (tokens[0].equalsIgnoreCase("pssl")) {
ConnectionInfo connectionInfo = ovsdbNodeAugmentation.getConnectionInfo();
if (connectionInfo != null && connectionInfo.getLocalIp() != null) {
- controllerIpStr = String.valueOf(connectionInfo.getLocalIp().getValue());
+ controllerIpStr = connectionInfo.getLocalIp().stringValue();
controllersStr.add(OPENFLOW_SECURE_PROTOCOL
+ ":" + controllerIpStr + ":" + OPENFLOW_PORT);
} else {