Reversion yang model

[neutron.git] / transcriber / src / main / java / org / opendaylight / neutron / transcriber / NeutronSecurityGroupInterface.java

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
index b0f5ab3b47fa748a438f1d996fa6547a3100b5bc..133f1a9e70f3aca7436d3f30585e91c1a531e8fd 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
@@ -21,10 +21,10 @@ import org.opendaylight.neutron.spi.NeutronCRUDInterfaces;
 import org.opendaylight.neutron.spi.NeutronSecurityGroup;
 import org.opendaylight.neutron.spi.NeutronSecurityRule;
 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.neutron.rev150325.Neutron;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.groups.attributes.SecurityGroups;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.groups.attributes.security.groups.SecurityGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.groups.attributes.security.groups.SecurityGroupBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.SecurityGroups;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroup;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroupBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
-public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<SecurityGroup,NeutronSecurityGroup> implements INeutronSecurityGroupCRUD {
+public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<SecurityGroup, SecurityGroups, NeutronSecurityGroup> implements INeutronSecurityGroupCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronSecurityGroupInterface.class);
 
 
@@ -51,18 +51,8 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
     }
 
     @Override
-    public List<NeutronSecurityGroup> getAll() {
-        Set<NeutronSecurityGroup> allSecurityGroups = new HashSet<NeutronSecurityGroup>();
-        SecurityGroups groups = readMd(createInstanceIdentifier());
-        if (groups != null) {
-            for (SecurityGroup group: groups.getSecurityGroup()) {
-                allSecurityGroups.add(fromMd(group));
-            }
-        }
-        LOGGER.debug("Exiting getSecurityGroups, Found {} OpenStackSecurityGroup", allSecurityGroups.size());
-        List<NeutronSecurityGroup> ans = new ArrayList<NeutronSecurityGroup>();
-        ans.addAll(allSecurityGroups);
-        return ans;
+    protected List<SecurityGroup> getDataObjectList(SecurityGroups groups) {
+        return groups.getSecurityGroup();
     }
 
     @Override
@@ -99,7 +89,7 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
             answer.setSecurityGroupDescription(group.getDescription());
         }
         if (group.getTenantId() != null) {
-            answer.setSecurityGroupTenantID(group.getTenantId().getValue().replace("-",""));
+            answer.setTenantID(group.getTenantId());
         }
         if (group.getSecurityRules() != null) {
             NeutronCRUDInterfaces interfaces = new NeutronCRUDInterfaces()
@@ -127,8 +117,8 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
         if (securityGroup.getSecurityGroupDescription() != null) {
             securityGroupBuilder.setDescription(securityGroup.getSecurityGroupDescription());
         }
-        if (securityGroup.getSecurityGroupTenantID() != null) {
-            securityGroupBuilder.setTenantId(toUuid(securityGroup.getSecurityGroupTenantID()));
+        if (securityGroup.getTenantID() != null) {
+            securityGroupBuilder.setTenantId(toUuid(securityGroup.getTenantID()));
         }
         if (securityGroup.getSecurityRules() != null) {
             List<Uuid> neutronSecurityRule = new ArrayList<Uuid>();
@@ -155,6 +145,7 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
                                                securityGroup.getKey());
     }
 
+    @Override
     protected InstanceIdentifier<SecurityGroups> createInstanceIdentifier() {
         return InstanceIdentifier.create(Neutron.class)
             .child(SecurityGroups.class);