Making the FLowMods Strict. During update operations, a Non-Strict flow is being...

[ovsdb.git] / neutron / src / main / java / org / opendaylight / ovsdb / neutron / NetworkHandler.java

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
index 62800951a87e7fd85117fd3ee9ad58a1cffd5213..62880477910e7cbee24ae8056a756961159b66f5 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
@@ -1,9 +1,16 @@
+/*
+ * Copyright (C) 2013 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Authors : Madhu Venugopal, Brent Salisbury
+ */
 package org.opendaylight.ovsdb.neutron;
 
 import java.net.HttpURLConnection;
-import java.util.List;
 
-import org.opendaylight.controller.containermanager.ContainerConfig;
 import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkAware;
 import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
 import org.slf4j.Logger;
@@ -33,14 +40,6 @@ public class NetworkHandler extends BaseHandler
             return HttpURLConnection.HTTP_NOT_ACCEPTABLE;
         }
 
-        String networkID = convertNeutronIDToKey(network.getID());
-
-        List<String> containers = containerManager.getContainerNames();
-        if (containers.contains(networkID)) {
-            logger.debug("Container with name {} exists", networkID);
-            return HttpURLConnection.HTTP_CONFLICT;
-        }
-
         return HttpURLConnection.HTTP_CREATED;
     }
 
@@ -58,14 +57,7 @@ public class NetworkHandler extends BaseHandler
             logger.debug("Network creation failed {} ", result);
             return;
         }
-        String networkId = convertNeutronIDToKey(network.getID());
-
-        // Get Network Tenant ready - Containers and Internal Vlans.
-        result = TenantNetworkManager.getManager().networkCreated(networkId);
-        logger.debug("Neutron Network {} Created with Internal Vlan : {}", network.toString(), result);
 
-        // Get internal network ready for Overlays
-        InternalNetworkManager.getManager().prepareInternalNetwork(network);
     }
 
     /**
@@ -120,10 +112,6 @@ public class NetworkHandler extends BaseHandler
                     result);
             return;
         }
-        String networkID = convertNeutronIDToKey(network.getID());
-
-        ContainerConfig config = new ContainerConfig();
-        config.setContainer(networkID);
-        containerManager.removeContainer(config);
+        TenantNetworkManager.getManager().networkDeleted(network.getID());
     }
 }