X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=transcriber%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fneutron%2Ftranscriber%2FNeutronVPNIPSECSiteConnectionsInterface.java;h=bf5b31c53f389becea2b49ae3ee71e8c92f5ef74;hb=387da5cb8efb0336df846c1e5d02f7fab2a599dd;hp=237c0706f969f5ee56bd8a13307c6b7c949996af;hpb=a4cf4fe4bd278684a815d15e7f9bc41bcc9a15e2;p=neutron.git

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECSiteConnectionsInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECSiteConnectionsInterface.java
index 237c0706f..bf5b31c53 100644
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECSiteConnectionsInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNIPSECSiteConnectionsInterface.java
@@ -18,18 +18,18 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderCo
 import org.opendaylight.neutron.spi.INeutronVPNIPSECSiteConnectionsCRUD;
 import org.opendaylight.neutron.spi.NeutronVPNDeadPeerDetection;
 import org.opendaylight.neutron.spi.NeutronVPNIPSECSiteConnection;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.ipsecconnection.attributes.DpdBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.ipsecconnections.attributes.IpsecSiteConnections;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.ipsecconnections.attributes.ipsec.site.connections.Ipsecsiteconnection;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.ipsecconnections.attributes.ipsec.site.connections.IpsecsiteconnectionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150325.Neutron;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.ipsecconnection.attributes.DpdBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.ipsecconnections.attributes.IpsecSiteConnections;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.ipsecconnections.attributes.ipsec.site.connections.Ipsecsiteconnection;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev150712.ipsecconnections.attributes.ipsec.site.connections.IpsecsiteconnectionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NeutronVPNIPSECSiteConnectionsInterface extends AbstractNeutronInterface<Ipsecsiteconnection, NeutronVPNIPSECSiteConnection> implements INeutronVPNIPSECSiteConnectionsCRUD {
+public class NeutronVPNIPSECSiteConnectionsInterface extends AbstractNeutronInterface<Ipsecsiteconnection, IpsecSiteConnections, NeutronVPNIPSECSiteConnection> implements INeutronVPNIPSECSiteConnectionsCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronVPNIKEPolicyInterface.class);
 
     NeutronVPNIPSECSiteConnectionsInterface(ProviderContext providerContext) {
@@ -40,69 +40,42 @@ public class NeutronVPNIPSECSiteConnectionsInterface extends AbstractNeutronInte
 
     @Override
     public boolean neutronVPNIPSECSiteConnectionsExists(String uuid) {
-        Ipsecsiteconnection connection = readMd(createInstanceIdentifier(toMd(uuid)));
-        if (connection == null) {
-            return false;
-        }
-        return true;
+        return exists(uuid);
     }
 
     @Override
     public NeutronVPNIPSECSiteConnection getNeutronVPNIPSECSiteConnections(String uuid) {
-        Ipsecsiteconnection connection = readMd(createInstanceIdentifier(toMd(uuid)));
-        if (connection == null) {
-            return null;
-        }
-        return fromMd(connection);
+        return get(uuid);
+    }
+
+    @Override
+    protected List<Ipsecsiteconnection> getDataObjectList(IpsecSiteConnections connections) {
+        return connections.getIpsecsiteconnection();
     }
 
     @Override
     public List<NeutronVPNIPSECSiteConnection> getAllNeutronVPNIPSECSiteConnections() {
-        Set<NeutronVPNIPSECSiteConnection> allNeutronVPNIPSECSiteConnections = new HashSet<NeutronVPNIPSECSiteConnection>();
-        IpsecSiteConnections connections = readMd(createInstanceIdentifier());
-        if (connections != null) {
-            for (Ipsecsiteconnection connection: connections.getIpsecsiteconnection()) {
-                allNeutronVPNIPSECSiteConnections.add(fromMd(connection));
-            }
-        }
-        LOGGER.debug("Exiting getAllNeutronVPNIPSECSiteConnections, Found {} OpenStackVPNIPSECSiteConnections", allNeutronVPNIPSECSiteConnections.size());
-        List<NeutronVPNIPSECSiteConnection> ans = new ArrayList<NeutronVPNIPSECSiteConnection>();
-        ans.addAll(allNeutronVPNIPSECSiteConnections);
-        return ans;
+        return getAll();
     }
 
     @Override
     public boolean addNeutronVPNIPSECSiteConnections(NeutronVPNIPSECSiteConnection input) {
-        if (neutronVPNIPSECSiteConnectionsExists(input.getID())) {
-            return false;
-        }
-        addMd(input);
-        return true;
+        return add(input);
     }
 
     @Override
     public boolean removeNeutronVPNIPSECSiteConnections(String policyID) {
-        if (!neutronVPNIPSECSiteConnectionsExists(policyID)) {
-            return false;
-        }
-        return removeMd(toMd(policyID));
+        return remove(policyID);
     }
 
     @Override
     public boolean updateNeutronVPNIPSECSiteConnections(String policyID, NeutronVPNIPSECSiteConnection delta) {
-        if (!neutronVPNIPSECSiteConnectionsExists(policyID)) {
-            return false;
-        }
-        updateMd(delta);
-        return true;
+        return update(policyID, delta);
     }
 
     @Override
     public boolean neutronVPNIPSECSiteConnectionsInUse(String policyID) {
-        if (!neutronVPNIPSECSiteConnectionsExists(policyID)) {
-            return true;
-        }
-        return false;
+        return !exists(policyID);
     }
 
     protected NeutronVPNIPSECSiteConnection fromMd(Ipsecsiteconnection ipsecSiteConnection) {
@@ -111,7 +84,7 @@ public class NeutronVPNIPSECSiteConnectionsInterface extends AbstractNeutronInte
             answer.setName(ipsecSiteConnection.getName());
         }
         if (ipsecSiteConnection.getTenantId() != null) {
-            answer.setTenantID(ipsecSiteConnection.getTenantId().getValue().replace("-",""));
+            answer.setTenantID(ipsecSiteConnection.getTenantId());
         }
         answer.setStatus(ipsecSiteConnection.getStatus());
         if (ipsecSiteConnection.isAdminStateUp() != null) {
@@ -239,6 +212,7 @@ public class NeutronVPNIPSECSiteConnectionsInterface extends AbstractNeutronInte
         return ipsecSiteConnectionBuilder.build();
     }
 
+    @Override
     protected InstanceIdentifier<IpsecSiteConnections> createInstanceIdentifier() {
         return InstanceIdentifier.create(Neutron.class)
                  .child(IpsecSiteConnections.class);