add blueprint wiring for neutron/transcriber

[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 242a1932380b3ff9f264a4a09ed35d85276e843a..403cd30e1822c6db9086ec6983ed19430cade909 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
@@ -8,23 +8,16 @@
 
 package org.opendaylight.neutron.transcriber;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD;
-import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD;
-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.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;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,18 +26,8 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronSecurityGroupInterface.class);
 
 
-    NeutronSecurityGroupInterface(ProviderContext providerContext) {
-        super(providerContext);
-    }
-
-    @Override
-    public boolean neutronSecurityGroupExists(String uuid) {
-        return exists(uuid);
-    }
-
-    @Override
-    public NeutronSecurityGroup getNeutronSecurityGroup(String uuid) {
-        return get(uuid);
+    NeutronSecurityGroupInterface(DataBroker db) {
+        super(db);
     }
 
     @Override
@@ -52,63 +35,17 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
         return groups.getSecurityGroup();
     }
 
-    @Override
-    public List<NeutronSecurityGroup> getAllNeutronSecurityGroups() {
-        return getAll();
-    }
-
-    @Override
-    public boolean addNeutronSecurityGroup(NeutronSecurityGroup input) {
-        return add(input);
-    }
-
-    @Override
-    public boolean removeNeutronSecurityGroup(String uuid) {
-        return remove(uuid);
-    }
-
-    @Override
-    public boolean updateNeutronSecurityGroup(String uuid, NeutronSecurityGroup delta) {
-        return update(uuid, delta);
-    }
-
-    @Override
-    public boolean neutronSecurityGroupInUse(String securityGroupUUID) {
-        return !exists(securityGroupUUID);
-    }
-
     protected NeutronSecurityGroup fromMd(SecurityGroup group) {
         final NeutronSecurityGroup answer = new NeutronSecurityGroup();
         if (group.getName() != null) {
             answer.setSecurityGroupName(group.getName());
         }
-        if (group.getDescription() != null) {
-            answer.setSecurityGroupDescription(group.getDescription());
-        }
         if (group.getTenantId() != null) {
             answer.setTenantID(group.getTenantId());
         }
-
-        // Bug 4550
-        // https://bugs.opendaylight.org/show_bug.cgi?id=4550
-        // Now SecurityGroup::securityGroupRule isn't updated.
-        // always rebuid it from security group rules
-        final NeutronCRUDInterfaces interfaces = new NeutronCRUDInterfaces()
-            .fetchINeutronSecurityRuleCRUD(this);
-        final INeutronSecurityRuleCRUD srCrud = interfaces.getSecurityRuleInterface();
-
-        final List<NeutronSecurityRule> rules = new ArrayList<NeutronSecurityRule>();
-        final String sgId = group.getUuid().getValue();
-        for (final NeutronSecurityRule rule: srCrud.getAll()) {
-            if (rule.getSecurityRuleGroupID().equals(sgId)) {
-                rules.add(rule);
-            }
-        }
-        answer.setSecurityRules(rules);
-
         if (group.getUuid() != null) {
             answer.setID(group.getUuid().getValue());
-        } 
+        }
         return answer;
     }
 
@@ -118,18 +55,9 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
         if (securityGroup.getSecurityGroupName() != null) {
             securityGroupBuilder.setName(securityGroup.getSecurityGroupName());
         }
-        if (securityGroup.getSecurityGroupDescription() != null) {
-            securityGroupBuilder.setDescription(securityGroup.getSecurityGroupDescription());
-        }
         if (securityGroup.getTenantID() != null) {
             securityGroupBuilder.setTenantId(toUuid(securityGroup.getTenantID()));
         }
-
-        // don't update security group rule, always empty list
-        // Bug 4550
-        // https://bugs.opendaylight.org/show_bug.cgi?id=4550
-        securityGroupBuilder.setSecurityRules(new ArrayList<Uuid>());
-
         if (securityGroup.getID() != null) {
             securityGroupBuilder.setUuid(toUuid(securityGroup.getID()));
         } else {
@@ -158,14 +86,4 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
         securityGroupBuilder.setUuid(toUuid(uuid));
         return securityGroupBuilder.build();
     }
-
-    public static void registerNewInterface(BundleContext context,
-                                            ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) {
-        final NeutronSecurityGroupInterface neutronSecurityGroupInterface = new NeutronSecurityGroupInterface(providerContext);
-        final ServiceRegistration<INeutronSecurityGroupCRUD> neutronSecurityGroupInterfaceRegistration = context.registerService(INeutronSecurityGroupCRUD.class, neutronSecurityGroupInterface, null);
-        if(neutronSecurityGroupInterfaceRegistration != null) {
-            registrations.add(neutronSecurityGroupInterfaceRegistration);
-        }
-    }
 }