X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openstack%2Fnet-virt%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Fopenstack%2Fnetvirt%2FPortHandler.java;h=68916b9946269174ca092b3716f0313c56e2ab42;hb=75f8e714f9fa407991a2c67b078e5791c5529936;hp=1d55cb33cba7798187adfc851b37ad1567769438;hpb=93fce59aa4f5bb11f0e9feb7ea46d39adf24871a;p=ovsdb.git diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java index 1d55cb33c..68916b994 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java @@ -11,17 +11,17 @@ package org.opendaylight.ovsdb.openstack.netvirt; import org.opendaylight.neutron.spi.INeutronPortAware; import org.opendaylight.neutron.spi.NeutronPort; -import org.opendaylight.controller.sal.core.Node; import org.opendaylight.ovsdb.lib.notation.Row; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.Constants; import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConfigurationService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService; -import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbInventoryListener; +import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService; +import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService; +import org.opendaylight.ovsdb.plugin.api.OvsdbInventoryListener; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.Port; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +45,6 @@ public class PortHandler extends AbstractHandler // The implementation for each of these services is resolved by the OSGi Service Manager private volatile OvsdbConfigurationService ovsdbConfigurationService; private volatile OvsdbConnectionService connectionService; - private volatile OvsdbInventoryListener ovsdbInventoryListener; private volatile NeutronL3Adapter neutronL3Adapter; /** @@ -57,22 +56,16 @@ public class PortHandler extends AbstractHandler */ @Override public int canCreatePort(NeutronPort port) { - return HttpURLConnection.HTTP_CREATED; + return HttpURLConnection.HTTP_OK; } /** * Invoked to take action after a port has been created. * - * @param port An instance of new Neutron Port object. + * @param neutronPort An instance of new Neutron Port object. */ @Override public void neutronPortCreated(NeutronPort neutronPort) { - int result = canCreatePort(neutronPort); - if (result != HttpURLConnection.HTTP_CREATED) { - logger.error(" Port create validation failed result - {} ", result); - return; - } - enqueueEvent(new NorthboundEvent(neutronPort, Action.ADD)); } private void doNeutronPortCreated(NeutronPort neutronPort) { @@ -96,22 +89,13 @@ public class PortHandler extends AbstractHandler @Override public int canUpdatePort(NeutronPort delta, NeutronPort original) { - int result = HttpURLConnection.HTTP_OK; - /** - * To basic validation of the request - */ - - if ((original == null) || (delta == null)) { - logger.error("port object not specified"); - return HttpURLConnection.HTTP_BAD_REQUEST; - } - return result; + return HttpURLConnection.HTTP_OK; } /** * Invoked to take action after a port has been updated. * - * @param port An instance of modified Neutron Port object. + * @param neutronPort An instance of modified Neutron Port object. */ @Override public void neutronPortUpdated(NeutronPort neutronPort) { @@ -141,13 +125,6 @@ public class PortHandler extends AbstractHandler */ @Override public void neutronPortDeleted(NeutronPort neutronPort) { - - int result = canDeletePort(neutronPort); - if (result != HttpURLConnection.HTTP_OK) { - logger.error(" deletePort validation failed - result {} ", result); - return; - } - enqueueEvent(new NorthboundEvent(neutronPort, Action.DELETE)); } private void doNeutronPortDeleted(NeutronPort neutronPort) { @@ -207,7 +184,7 @@ public class PortHandler extends AbstractHandler * Process the event. * * @param abstractEvent the {@link org.opendaylight.ovsdb.openstack.netvirt.AbstractEvent} event to be handled. - * @see EventDispatcher + * @see org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher */ @Override public void processEvent(AbstractEvent abstractEvent) {