- List<Subnets> subnetsList = transportZone.getSubnets();
- if (subnetsList != null) {
- for (Subnets subnet : subnetsList) {
- IpPrefix ipPrefix = subnet.getPrefix();
- IpAddress gatewayIP = subnet.getGatewayIp();
- int vlanID = subnet.getVlanId();
- LOG.trace("IpPrefix: {}, gatewayIP: {}, vlanID: {} ", ipPrefix, gatewayIP, vlanID);
- List<Vteps> vtepsList = subnet.getVteps();
- if (vtepsList != null && !vtepsList.isEmpty()) {
- for (Vteps vteps : vtepsList) {
- BigInteger dpnID = vteps.getDpnId();
- String port = vteps.getPortname();
- IpAddress ipAddress = vteps.getIpAddress();
- boolean useOfTunnel = ItmUtils.falseIfNull(vteps.isOptionOfTunnel());
- String tos = vteps.getOptionTunnelTos();
- if (tos == null) {
- tos = itmConfig.getDefaultTunnelTos();
- }
- LOG.trace("DpnID: {}, port: {}, ipAddress: {}", dpnID, port, ipAddress);
- TunnelEndPoints tunnelEndPoints = ItmUtils.createTunnelEndPoints(dpnID, ipAddress, port,
- useOfTunnel, vlanID, ipPrefix, gatewayIP, zones, tunnelType, tos);
- List<TunnelEndPoints> tunnelEndPointsList = mapDPNToTunnelEndpt.get(dpnID);
- if (tunnelEndPointsList != null) {
- LOG.trace("Existing DPN info list in the Map: {} ", dpnID);
- tunnelEndPointsList.add(tunnelEndPoints);
- } else {
- LOG.trace("Adding new DPN info list to the Map: {} ", dpnID);
- tunnelEndPointsList = new ArrayList<>();
- tunnelEndPointsList.add(tunnelEndPoints);
- mapDPNToTunnelEndpt.put(dpnID, tunnelEndPointsList);
- }
- }
+ List<Vteps> vtepsList = transportZone.getVteps();
+
+ String portName = (itmConfig.getPortname() == null) ? ITMConstants.DUMMY_PORT : itmConfig.getPortname();
+ int vlanId = (itmConfig.getVlanId() != null) ? itmConfig.getVlanId() : ITMConstants.DUMMY_VLANID;
+
+ if (vtepsList != null && !vtepsList.isEmpty()) {
+ for (Vteps vteps : vtepsList) {
+ BigInteger dpnID = vteps.getDpnId();
+ IpAddress ipAddress = vteps.getIpAddress();
+ boolean useOfTunnel = ItmUtils.falseIfNull(vteps.isOptionOfTunnel());
+ String tos = vteps.getOptionTunnelTos();
+ if (tos == null) {
+ tos = itmConfig.getDefaultTunnelTos();
+ }
+ LOG.trace("DpnID: {}, ipAddress: {}", dpnID, ipAddress);
+ TunnelEndPoints tunnelEndPoints = ItmUtils.createTunnelEndPoints(dpnID, ipAddress, portName,
+ useOfTunnel, vlanId, zones, tunnelType, tos);
+ List<TunnelEndPoints> tunnelEndPointsList = mapDPNToTunnelEndpt.get(dpnID);
+ if (tunnelEndPointsList != null) {
+ LOG.trace("Existing DPN info list in the Map: {} ", dpnID);
+ tunnelEndPointsList.add(tunnelEndPoints);
+ } else {
+ LOG.trace("Adding new DPN info list to the Map: {} ", dpnID);
+ tunnelEndPointsList = new ArrayList<>();
+ tunnelEndPointsList.add(tunnelEndPoints);
+ mapDPNToTunnelEndpt.put(dpnID, tunnelEndPointsList);