NETVIRT-1630 migrate to md-sal APIs

[netvirt.git] / natservice / impl / src / main / java / org / opendaylight / netvirt / natservice / rpcservice / NatRpcServiceImpl.java

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java
index 1e64f03205d0ee7e7ad3c1e6dd4b8d73c1716c29..8d182d7b3edc6f1d56be0f05f4d53ad96d0a7ad9 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/rpcservice/NatRpcServiceImpl.java
@@ -13,8 +13,8 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.mdsalutil.NwConstants;
+import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.netvirt.natservice.internal.NatConstants;
 import org.opendaylight.netvirt.natservice.internal.NatUtil;
 import org.opendaylight.netvirt.neutronvpn.interfaces.INeutronVpnManager;
@@ -46,6 +46,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.s
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,7 +78,7 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
         }
         List<RouterNat> natRouterList = new ArrayList<>();
         for (Uuid routerUuid : routerUuidList) {
-            long routerId = NatUtil.getVpnId(dataBroker, routerUuid.getValue());
+            Uint32 routerId = NatUtil.getVpnId(dataBroker, routerUuid.getValue());
             if (routerId == NatConstants.INVALID_ID) {
                 LOG.warn("getNatTranslationsOnVpn : Invalid RouterID found {}", routerId);
                 continue;
@@ -95,7 +96,7 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
     public ListenableFuture<RpcResult<GetNatTranslationsOnRouterOutput>> getNatTranslationsOnRouter(
             GetNatTranslationsOnRouterInput input) {
         RpcResultBuilder<GetNatTranslationsOnRouterOutput> rpcResultBuilder = null;
-        long routerId = NatUtil.getVpnId(dataBroker, input.getRouterUuid().getValue());
+        Uint32 routerId = NatUtil.getVpnId(dataBroker, input.getRouterUuid().getValue());
         if (routerId == NatConstants.INVALID_ID) {
             String errMsg = String.format("404 Not Found - No Router found with UUID {%s}",
                     input.getRouterUuid().getValue());
@@ -134,7 +135,7 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
         outerloop:
         for (Uuid subnetUuid: subnetUuidList) {
             subNet = nvpnManager.getNeutronSubnet(subnetUuid);
-            for (AllocationPools allocationPool : subNet.getAllocationPools()) {
+            for (AllocationPools allocationPool : subNet.nonnullAllocationPools()) {
                 if (NatUtil.isIpInSubnet(ipAddress,
                         allocationPool.getStart().stringValue(),
                         allocationPool.getEnd().stringValue())) {
@@ -155,15 +156,14 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
         }
 
         Subnetmap subnetMap = NatUtil.getSubnetMap(dataBroker, subNet.getUuid());
-        long routerId = NatUtil.getVpnId(dataBroker, subnetMap.getRouterId().getValue());
+        Uint32 routerId = NatUtil.getVpnId(dataBroker, subnetMap.getRouterId().getValue());
 
         List<Ports> fipPorts = NatUtil.getFloatingIpPortsForRouter(dataBroker, subnetMap.getRouterId());
         if (fipPorts.isEmpty()) {
             LOG.warn("getNatTranslationsForNetworkAndIpaddress : No DNAT IP Mapping found for IP {}", ipAddress);
         } else {
             for (Ports fipPort : fipPorts) {
-                List<InternalToExternalPortMap> ipMapping = fipPort.getInternalToExternalPortMap();
-                for (InternalToExternalPortMap fipMap : ipMapping) {
+                for (InternalToExternalPortMap fipMap : fipPort.nonnullInternalToExternalPortMap()) {
                     if (fipMap.getInternalIp().equals(ipAddress)) {
                         output = new GetNatTranslationsForNetworkAndIpaddressOutputBuilder()
                                     .setExternalIp(fipMap.getExternalIp())
@@ -180,8 +180,8 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
         if (ipPortMapping == null) {
             LOG.warn("getNatTranslationsForNetworkAndIpaddress : No SNAT IP Mapping found for IP {}", ipAddress);
         } else {
-            for (IntextIpProtocolType protocolType : ipPortMapping.getIntextIpProtocolType()) {
-                for (IpPortMap ipPortMap : protocolType.getIpPortMap()) {
+            for (IntextIpProtocolType protocolType : ipPortMapping.nonnullIntextIpProtocolType()) {
+                for (IpPortMap ipPortMap : protocolType.nonnullIpPortMap()) {
                     String[] internalIpPort = ipPortMap.getIpPortInternal().split(NwConstants.MACADDR_SEP);
                     if (ipAddress.equals(internalIpPort[0])) {
 
@@ -206,7 +206,7 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
         return rpcResultBuilder.buildFuture();
     }
 
-    private List<RouterNat> constructNatInformation(Uuid routerUuid, long routerId) {
+    private List<RouterNat> constructNatInformation(Uuid routerUuid, Uint32 routerId) {
 
         String neutronRouterName = NatUtil.getNeutronRouterNamebyUuid(dataBroker, routerUuid);
 
@@ -222,8 +222,8 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
             // Capturing SNAT information
             List<SnatIpMapping> snatIpMapping = new ArrayList<>();
 
-            for (IntextIpProtocolType protocolType : ipPortMapping.getIntextIpProtocolType()) {
-                for (IpPortMap ipPortMap : protocolType.getIpPortMap()) {
+            for (IntextIpProtocolType protocolType : ipPortMapping.nonnullIntextIpProtocolType()) {
+                for (IpPortMap ipPortMap : protocolType.nonnullIpPortMap()) {
                     String[] internalPortMap = ipPortMap.getIpPortInternal().split(NwConstants.MACADDR_SEP);
                     SnatIpMappingBuilder natIpMappingBuilder = new SnatIpMappingBuilder()
                             .setInternalIp(internalPortMap[0]).setInternalPort(internalPortMap[1])
@@ -243,8 +243,7 @@ public class NatRpcServiceImpl implements OdlNatRpcService {
             LOG.warn("constructNatInformation : No DNAT IP Mapping found for router-uuid {}", routerUuid.getValue());
         } else {
             for (Ports fipPort : fipPorts) {
-                List<InternalToExternalPortMap> ipMapping = fipPort.getInternalToExternalPortMap();
-                for (InternalToExternalPortMap fipMap : ipMapping) {
+                for (InternalToExternalPortMap fipMap : fipPort.nonnullInternalToExternalPortMap()) {
                     DnatIpMappingBuilder natIpMappingBuilder = new DnatIpMappingBuilder()
                             .setExternalIp(fipMap.getExternalIp()).setInternalIp(fipMap.getInternalIp());
                     dnatIpMapping.add(natIpMappingBuilder.build());