X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=neutronvpn%2Fneutronvpn-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fvpnservice%2Fneutronvpn%2FNeutronvpnUtils.java;h=f9e7e3d32966bbe412e650428cb1c06c4a49e140;hb=9c0e16907ffb4d6c79ea397885f9dfed738dc848;hp=71d11541a41a2a365677812be30b170535992a0f;hpb=15efaff98fdbbfa3471712ef5c5f0e55aad59a1c;p=vpnservice.git diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java index 71d11541..f9e7e3d3 100644 --- a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java +++ b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronvpnUtils.java @@ -13,6 +13,9 @@ import com.google.common.base.Optional; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.VpnInterfaces; +import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.interfaces.VpnInterface; +import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.interfaces.VpnInterfaceKey; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey; @@ -23,7 +26,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.router import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.Networks; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.NetworkKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.NetworkProviderExtension; +import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port; +import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.PortKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.Subnets; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet; @@ -44,10 +50,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.neutronvpn.rev15 .PortFixedipToPortName; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.neutronvpn.rev150602.neutron.port.data .PortFixedipToPortNameKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.neutronvpn.rev150602.neutron.port.data - .PortNameToPortUuid; -import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.neutronvpn.rev150602.neutron.port.data - .PortNameToPortUuidKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.neutronvpn.rev150602.subnetmaps.Subnetmap; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.neutronvpn.rev150602.subnetmaps.SubnetmapKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.neutronvpn.rev150602.vpnmaps.VpnMap; @@ -63,10 +65,6 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -//import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.port.ext.rev151125.TrunkportExt; -//import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.port.ext.rev151125.TrunkportTypeBase; -//import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.port.ext.rev151125.TrunkportTypeSubport; - public class NeutronvpnUtils { private static final Logger logger = LoggerFactory.getLogger(NeutronvpnUtils.class); @@ -95,11 +93,11 @@ public class NeutronvpnUtils { protected static Uuid getVpnForNetwork(DataBroker broker, Uuid network) { InstanceIdentifier vpnMapsIdentifier = InstanceIdentifier.builder(VpnMaps.class).build(); Optional optionalVpnMaps = read(broker, LogicalDatastoreType.CONFIGURATION, vpnMapsIdentifier); - if (optionalVpnMaps.isPresent()) { - VpnMaps vpnMaps = optionalVpnMaps.get(); - List allMaps = vpnMaps.getVpnMap(); + if (optionalVpnMaps.isPresent() && optionalVpnMaps.get().getVpnMap() != null) { + List allMaps = optionalVpnMaps.get().getVpnMap(); for (VpnMap vpnMap : allMaps) { - if (vpnMap.getNetworkIds().contains(network)) { + List netIds = vpnMap.getNetworkIds(); + if ((netIds != null) && (netIds.contains(network))) { return vpnMap.getVpnId(); } } @@ -112,9 +110,8 @@ public class NeutronvpnUtils { InstanceIdentifier vpnMapsIdentifier = InstanceIdentifier.builder(VpnMaps.class).build(); Optional optionalVpnMaps = read(broker, LogicalDatastoreType.CONFIGURATION, vpnMapsIdentifier); - if (optionalVpnMaps.isPresent()) { - VpnMaps vpnNets = optionalVpnMaps.get(); - List allMaps = vpnNets.getVpnMap(); + if (optionalVpnMaps.isPresent() && optionalVpnMaps.get().getVpnMap() != null) { + List allMaps = optionalVpnMaps.get().getVpnMap(); if (routerId != null) { for (VpnMap vpnMap : allMaps) { if (routerId.equals(vpnMap.getRouterId())) { @@ -145,15 +142,6 @@ public class NeutronvpnUtils { return null; } - protected static Uuid getNeutronPortIdfromPortName(DataBroker broker, String portname) { - InstanceIdentifier id = buildPortNameToPortUuidIdentifier(portname); - Optional portNameToPortUuidData = read(broker, LogicalDatastoreType.CONFIGURATION, id); - if (portNameToPortUuidData.isPresent()) { - return portNameToPortUuidData.get().getPortId(); - } - return null; - } - protected static String getNeutronPortNamefromPortFixedIp(DataBroker broker, String fixedIp) { InstanceIdentifier id = buildFixedIpToPortNameIdentifier(fixedIp); Optional portFixedipToPortNameData = read(broker, LogicalDatastoreType.CONFIGURATION, @@ -173,22 +161,6 @@ public class NeutronvpnUtils { return null; } - //TODO - //Will be done once integrated with TrunkPort Extensions - protected static int getVlanFromNeutronPort(Port port) { - int vlanId = 0; - /* - TrunkportExt trunkportExt = port.getAugmentation(TrunkportExt.class); - if (trunkportExt != null) { - Class trunkportType = trunkportExt.getType(); - if (trunkportType != null && trunkportType.isAssignableFrom(TrunkportTypeSubport.class)) { - vlanId = trunkportExt.getVid(); - } - } - */ - return vlanId; - } - protected static Router getNeutronRouter(DataBroker broker, Uuid routerId) { InstanceIdentifier inst = InstanceIdentifier.create(Neutron.class).child(Routers.class).child(Router @@ -211,6 +183,15 @@ public class NeutronvpnUtils { return null; } + protected static String getSegmentationIdFromNeutronNetwork(Network network) { + String segmentationId = null; + NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + if (providerExtension != null) { + segmentationId = providerExtension.getSegmentationId(); + } + return segmentationId; + } + protected static List getNeutronRouterSubnetIds(DataBroker broker, Uuid routerId) { logger.info("getNeutronRouterSubnetIds for {}", routerId.getValue()); @@ -219,7 +200,7 @@ public class NeutronvpnUtils { if (router != null) { List interfacesList = router.getInterfaces(); - if (!interfacesList.isEmpty()) { + if (interfacesList != null) { for (org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers .router.Interfaces interfaces : interfacesList) { subnetIdList.add(interfaces.getSubnetId()); @@ -230,6 +211,17 @@ public class NeutronvpnUtils { return subnetIdList; } + protected static Port getNeutronPort(DataBroker broker, Uuid portId) { + logger.debug("getNeutronPort for {}", portId.getValue()); + InstanceIdentifier inst = InstanceIdentifier.create(Neutron.class).child(Ports.class).child(Port.class, + new PortKey(portId)); + Optional port = read(broker, LogicalDatastoreType.CONFIGURATION, inst); + if (port.isPresent()) { + return port.get(); + } + return null; + } + protected static String uuidToTapPortName(Uuid id) { String tapId = id.getValue().substring(0, 11); return new StringBuilder().append("tap").append(tapId).toString(); @@ -238,37 +230,38 @@ public class NeutronvpnUtils { protected static boolean lock(LockManagerService lockManager, String lockName) { TryLockInput input = new TryLockInputBuilder().setLockName(lockName).setTime(5L).setTimeUnit (TimeUnits.Milliseconds).build(); - boolean islockAquired = false; + boolean islockAcquired = false; try { Future> result = lockManager.tryLock(input); if ((result != null) && (result.get().isSuccessful())) { logger.debug("Acquired lock for {}", lockName); - islockAquired = true; + islockAcquired = true; } else { - throw new RuntimeException(String.format("Unable to acquire lock for %s", lockName)); + logger.error("Unable to acquire lock for {}", lockName); } } catch (InterruptedException | ExecutionException e) { logger.error("Unable to acquire lock for {}", lockName); - throw new RuntimeException(String.format("Unable to acquire lock for %s", lockName), e - .getCause()); + throw new RuntimeException(String.format("Unable to acquire lock for %s", lockName), e.getCause()); } - return islockAquired; + return islockAcquired; } - protected static void unlock(LockManagerService lockManager, String lockName) { + protected static boolean unlock(LockManagerService lockManager, String lockName) { UnlockInput input = new UnlockInputBuilder().setLockName(lockName).build(); + boolean islockAcquired = false; try { Future> result = lockManager.unlock(input); if ((result != null) && (result.get().isSuccessful())) { logger.debug("Unlocked {}", lockName); + islockAcquired = true; } else { - logger.debug("Unable to unlock {}", lockName); + logger.error("Unable to unlock {}", lockName); } } catch (InterruptedException | ExecutionException e) { logger.error("Unable to unlock {}", lockName); - throw new RuntimeException(String.format("Unable to unlock %s", lockName), e - .getCause()); + throw new RuntimeException(String.format("Unable to unlock %s", lockName), e.getCause()); } + return islockAcquired; } protected static Short getIPPrefixFromPort(DataBroker broker, Port port) { @@ -296,18 +289,12 @@ public class NeutronvpnUtils { logger.trace("Unable to read on subnet datastore"); } } catch (Exception e) { - logger.trace("Failed to retrieve IP prefix from port : ", e); + logger.error("Failed to retrieve IP prefix from port : ", e); System.out.println("Failed to retrieve IP prefix from port : " + e.getMessage()); } return null; } - static InstanceIdentifier buildPortNameToPortUuidIdentifier(String portname) { - InstanceIdentifier id = InstanceIdentifier.builder(NeutronPortData.class).child - (PortNameToPortUuid.class, new PortNameToPortUuidKey(portname)).build(); - return id; - } - static InstanceIdentifier buildFixedIpToPortNameIdentifier(String fixedIp) { InstanceIdentifier id = InstanceIdentifier.builder(NeutronPortData.class).child (PortFixedipToPortName.class, new PortFixedipToPortNameKey(fixedIp)).build(); @@ -320,6 +307,12 @@ public class NeutronvpnUtils { return id; } + static InstanceIdentifier buildVpnInterfaceIdentifier(String ifName) { + InstanceIdentifier id = InstanceIdentifier.builder(VpnInterfaces.class). + child(VpnInterface.class, new VpnInterfaceKey(ifName)).build(); + return id; + } + static InstanceIdentifier buildSubnetMapIdentifier(Uuid subnetId) { InstanceIdentifier id = InstanceIdentifier.builder(Subnetmaps.class).child(Subnetmap.class, new SubnetmapKey(subnetId)).build();