Adding code for Security Group Rules - M5 Delivery

Change-Id: I324aecfa6beaa57870acd73f918ab62a846e0cb7

Signed-off-by: pchopra <pchopra@juniper.net>

diff --git a/neutron/src/main/java/org/opendaylight/plugin2oc/neutron/Activator.java b/neutron/src/main/java/org/opendaylight/plugin2oc/neutron/Activator.java
index 3185956b195b88e034047a4c38b13870c36e1443..f81d01615fca1ae083d1e1f80dc6ed8fc852b29c 100755 (executable)
--- a/neutron/src/main/java/org/opendaylight/plugin2oc/neutron/Activator.java
+++ b/neutron/src/main/java/org/opendaylight/plugin2oc/neutron/Activator.java
@@ -17,7 +17,7 @@ import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkAware;
 import org.opendaylight.controller.networkconfig.neutron.INeutronPortAware;
 import org.opendaylight.controller.networkconfig.neutron.INeutronRouterAware;
 import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityGroupAware;
-//import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityRuleAware;
+import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityRuleAware;
 import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetAware;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
@@ -80,10 +80,7 @@ public class Activator extends ComponentActivatorAbstractBase {
      */
     @Override
     public Object[] getImplementations() {
-        Object[] res = { NetworkHandler.class, SubnetHandler.class, PortHandler.class, RouterHandler.class, FloatingIpHandler.class,
-                SecurityGroupHandler.class,
-//                SecurityGroupRulesHandler.class
-                };
+        Object[] res = { NetworkHandler.class, SubnetHandler.class, PortHandler.class, RouterHandler.class, FloatingIpHandler.class, SecurityGroupHandler.class, SecurityGroupRulesHandler.class };
         return res;
     }
 
@@ -122,9 +119,9 @@ public class Activator extends ComponentActivatorAbstractBase {
         if (imp.equals(SecurityGroupHandler.class)) {
             c.setInterface(INeutronSecurityGroupAware.class.getName(), null);
         }
-//        if (imp.equals(SecurityGroupRulesHandler.class)) {
-//            c.setInterface(INeutronSecurityRuleAware.class.getName(), null);
-//        }
+        if (imp.equals(SecurityGroupRulesHandler.class)) {
+            c.setInterface(INeutronSecurityRuleAware.class.getName(), null);
+        }
         // Create service dependencies.
         c.add(createServiceDependency().setService(BindingAwareBroker.class).setCallbacks("setBindingAwareBroker", "unsetBindingAwareBroker")
                 .setRequired(true));

diff --git a/neutron/src/main/java/org/opendaylight/plugin2oc/neutron/SecurityGroupRulesHandler.java b/neutron/src/main/java/org/opendaylight/plugin2oc/neutron/SecurityGroupRulesHandler.java
index 0a3a659252de01e626468836ae664c4614cdfad3..a764dbd573eedce23a6920c77053a3c2cc5f5605 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/plugin2oc/neutron/SecurityGroupRulesHandler.java
+++ b/neutron/src/main/java/org/opendaylight/plugin2oc/neutron/SecurityGroupRulesHandler.java
@@ -75,7 +75,6 @@ public class SecurityGroupRulesHandler implements INeutronSecurityRuleAware {
             }
             secGroupRulesUUID = UUID.fromString(secGroupRulesUUID).toString();
         }
-        
         if (securityRule.getSecurityRuleDirection() == null || securityRule.getSecurityRuleDirection().equals("")) {
             LOGGER.error("SecurityGroup Rule direction can't be null/empty...");
             return HttpURLConnection.HTTP_BAD_REQUEST;
@@ -84,7 +83,6 @@ public class SecurityGroupRulesHandler implements INeutronSecurityRuleAware {
             LOGGER.error("SecurityGroup Rule direction invalid : Valid values are ingress/egress");
             return HttpURLConnection.HTTP_BAD_REQUEST;
         }
-        System.out.println("---------->"+securityRule.getSecurityRemoteGroupID()+"---------->"+securityRule.getSecurityRuleDirection()+"---------->"+securityRule.getSecurityRulePortMax()+"---------->"+securityRule.getSecurityRulePortMin());
         if (securityRule.getSecurityRulePortMin() == null || securityRule.getSecurityRulePortMax() == null) {
             LOGGER.error("SecurityGroup port min/max range can't be null/empty...");
             return HttpURLConnection.HTTP_BAD_REQUEST;
@@ -150,9 +148,7 @@ public class SecurityGroupRulesHandler implements INeutronSecurityRuleAware {
         if (securityRule.getSecurityRemoteGroupID() == null && securityRule.getSecurityRuleRemoteIpPrefix() == null) {
             LOGGER.error("Both SecurityGroup  remote ID and remote IP prefix can nor be null");
             return HttpURLConnection.HTTP_BAD_REQUEST;
-            
-            
-        }
+            }
         if(securityRule.getSecurityRuleRemoteIpPrefix() == null && securityRule.getSecurityRemoteGroupID() != null  )
         {
             virtualSecurityGroup = null;
@@ -166,8 +162,6 @@ public class SecurityGroupRulesHandler implements INeutronSecurityRuleAware {
                 return HttpURLConnection.HTTP_BAD_REQUEST;
             }
             secGroupRuleUUID = UUID.fromString(secGroupRuleUUID).toString();
-            
-            
             try {
                 virtualSecurityGroup = (SecurityGroup) apiConnector.findById(SecurityGroup.class, secGroupRuleUUID);
             } catch (IOException e) {
@@ -178,10 +172,7 @@ public class SecurityGroupRulesHandler implements INeutronSecurityRuleAware {
                 LOGGER.warn("SecurityRemoteGroup does not exists for the specified security group ID");
                 return HttpURLConnection.HTTP_FORBIDDEN;
             }
-            
-            
-        }
-      
+            }
         LOGGER.info("SecurityGroupRules object " + securityRule);
         return HttpURLConnection.HTTP_OK;
     }
@@ -296,14 +287,11 @@ public class SecurityGroupRulesHandler implements INeutronSecurityRuleAware {
             secGroupRuleUUID = Utils.uuidFormater(securityRule.getSecurityRuleGroupID());
         }
         secGroupRuleUUID = UUID.fromString(secGroupRuleUUID).toString();
-        
         String secRuleUUID = securityRule.getSecurityRuleUUID();
         if (!(securityRule.getSecurityRuleUUID().contains("-"))) {
             secRuleUUID = Utils.uuidFormater(securityRule.getSecurityRuleUUID());
         }
         secRuleUUID = UUID.fromString(secRuleUUID).toString();
-        
-        
         try {
             virtualSecurityGroup = (SecurityGroup) apiConnector.findById(SecurityGroup.class, secGroupRuleUUID);
         } catch (IOException e) {
@@ -313,7 +301,7 @@ public class SecurityGroupRulesHandler implements INeutronSecurityRuleAware {
         if (virtualSecurityGroup == null) {
             LOGGER.warn("SecurityGroup does not exists for the specified security group ID");
             return HttpURLConnection.HTTP_FORBIDDEN;
-        }
+            }
         boolean flag = false;
         if (virtualSecurityGroup.getEntries() != null) {
             if (virtualSecurityGroup.getEntries().getPolicyRule().isEmpty() == false) {
@@ -361,7 +349,6 @@ public class SecurityGroupRulesHandler implements INeutronSecurityRuleAware {
             secRuleUUID = Utils.uuidFormater(securityRule.getSecurityRuleUUID());
         }
         secRuleUUID = UUID.fromString(secRuleUUID).toString();
-        
         if (virtualSecurityGroup.getEntries() != null) {
             if (virtualSecurityGroup.getEntries().getPolicyRule().isEmpty() == false) {
                 ListIterator<PolicyRuleType> i = virtualSecurityGroup.getEntries().getPolicyRule().listIterator();
@@ -460,7 +447,6 @@ public class SecurityGroupRulesHandler implements INeutronSecurityRuleAware {
                 } catch (IOException e) {
                     LOGGER.error("Exception :     " + e);
                 }
-               
                 Iterator<String> i = virtualSecurityGroup.getQualifiedName().iterator();
                 while (i.hasNext()) {
                     if (securityGroupQualifiedName == null) {

diff --git a/neutron/src/test/java/org/opendaylight/plugin2oc/neutron/SecurityGroupRulesHandlerTest.java b/neutron/src/test/java/org/opendaylight/plugin2oc/neutron/SecurityGroupRulesHandlerTest.java
index 25b491db2d5f92c8473dcfe22e29fb22fbebaf33..bbb364186b49704b45a0fc23373814a9e3007843 100644 (file)
--- a/neutron/src/test/java/org/opendaylight/plugin2oc/neutron/SecurityGroupRulesHandlerTest.java
+++ b/neutron/src/test/java/org/opendaylight/plugin2oc/neutron/SecurityGroupRulesHandlerTest.java
@@ -18,7 +18,6 @@ import java.net.HttpURLConnection;
 
 import net.juniper.contrail.api.ApiConnector;
 import net.juniper.contrail.api.types.SecurityGroup;
-import net.juniper.contrail.api.types.SubnetType;
 
 import org.junit.After;
 import org.junit.Before;