From: Alexis de Talhouët Date: Tue, 17 May 2016 19:01:33 +0000 (-0400) Subject: Add blueprint wiring for openstack/net-virt X-Git-Tag: release/boron~309 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=aa78759db9f467e9918d7439429b98f6307be6a9;p=netvirt.git Add blueprint wiring for openstack/net-virt Change-Id: I0d32881db4c1ee939f87441d75e38dbe1c34374f Signed-off-by: Alexis de Talhouët --- diff --git a/features/pom.xml b/features/pom.xml index 89d050a7aa..8964c53740 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -170,13 +170,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html openstack.net-virt ${project.version} - - ${project.groupId} - openstack.net-virt - ${project.version} - xml - config - ${project.groupId} openstack.net-virt-providers diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml index c562b9cb62..c2f3a3f210 100644 --- a/features/src/main/features/features.xml +++ b/features/src/main/features/features.xml @@ -29,7 +29,6 @@ mvn:org.opendaylight.netvirt/openstack.net-virt/{{VERSION}} mvn:org.opendaylight.netvirt/openstack.net-virt-providers/{{VERSION}} mvn:commons-net/commons-net/{{VERSION}} - mvn:org.opendaylight.netvirt/openstack.net-virt/{{VERSION}}/xml/config mvn:org.opendaylight.netvirt/openstack.net-virt-providers/{{VERSION}}/xml/config diff --git a/openstack/net-virt/src/main/config/default-config.xml b/openstack/net-virt/src/main/config/default-config.xml deleted file mode 100644 index 5783eb551a..0000000000 --- a/openstack/net-virt/src/main/config/default-config.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:netvirt:impl?module=netvirt-impl&revision=2015-05-13 - - - - - - prefix:netvirt-impl - netvirt-default - false - true - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - ns:entity-ownership-service - entity-ownership-service - - - - - - diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/ConfigActivator.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/ConfigActivator.java index 0f84700836..2f33610f8e 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/ConfigActivator.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/ConfigActivator.java @@ -103,18 +103,18 @@ public class ConfigActivator implements BundleActivator { private static final Logger LOG = LoggerFactory.getLogger(ConfigActivator.class); private List> translatorCRUDRegistrations = new ArrayList<>(); private List> servicesAndRegistrations = new ArrayList<>(); - private ProviderContext providerContext; + private final DataBroker dataBroker; private boolean conntrackEnabled = false; private boolean intBridgeGenMac = true; - public ConfigActivator(ProviderContext providerContext) { - this.providerContext = providerContext; + public ConfigActivator(final DataBroker dataBroker) { + this.dataBroker = dataBroker; } @Override public void start(BundleContext context) throws Exception { LOG.info("ConfigActivator start:"); - registerCRUDServiceProviders(context, this.providerContext); + registerCRUDServiceProviders(context); ConfigurationServiceImpl configurationService = new ConfigurationServiceImpl(); registerService(context, new String[] {ConfigurationService.class.getName()}, @@ -198,7 +198,7 @@ public class ConfigActivator implements BundleActivator { new String[]{EventDispatcher.class.getName()}, null, eventDispatcher); final NeutronL3Adapter neutronL3Adapter = new NeutronL3Adapter( - new NeutronModelsDataStoreHelper(this.providerContext.getSALService(DataBroker.class))); + new NeutronModelsDataStoreHelper(dataBroker)); registerAbstractHandlerService(context, new Class[] {NeutronL3Adapter.class, GatewayMacResolverListener.class}, AbstractEvent.HandlerType.NEUTRON_L3_ADAPTER, neutronL3Adapter); @@ -215,11 +215,11 @@ public class ConfigActivator implements BundleActivator { registerService(context, new String[]{MultiTenantAwareRouter.class.getName()}, null, openstackRouter); - Southbound southbound = new SouthboundImpl(providerContext.getSALService(DataBroker.class)); + Southbound southbound = new SouthboundImpl(dataBroker); registerService(context, new String[]{Southbound.class.getName()}, null, southbound); - HostConfigService hostConfigService = new HostConfigService(providerContext.getSALService(DataBroker.class)); + HostConfigService hostConfigService = new HostConfigService(dataBroker); registerService(context, new String[]{HostConfigService.class.getName()}, null, hostConfigService); @@ -227,7 +227,7 @@ public class ConfigActivator implements BundleActivator { registerAbstractHandlerService(context, new Class[] {NodeCacheManager.class}, AbstractEvent.HandlerType.NODE, nodeCacheManager); - OvsdbInventoryServiceImpl ovsdbInventoryService = new OvsdbInventoryServiceImpl(providerContext); + OvsdbInventoryServiceImpl ovsdbInventoryService = new OvsdbInventoryServiceImpl(dataBroker); registerService(context, new String[] {OvsdbInventoryService.class.getName()}, null, ovsdbInventoryService); @@ -274,24 +274,23 @@ public class ConfigActivator implements BundleActivator { servicesAndRegistrations.clear(); } - private void registerCRUDServiceProviders(BundleContext context, - ProviderContext providerContext) { + private void registerCRUDServiceProviders(BundleContext context) { LOG.debug("Registering CRUD service providers"); - NeutronRouterInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronPortInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronSubnetInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronNetworkInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronSecurityGroupInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronSecurityRuleInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronFirewallInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronFirewallPolicyInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronFirewallRuleInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronLoadBalancerInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronLoadBalancerPoolInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronLoadBalancerListenerInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronLoadBalancerHealthMonitorInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronLoadBalancerPoolMemberInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); - NeutronFloatingIPInterface.registerNewInterface(context, providerContext, translatorCRUDRegistrations); + NeutronRouterInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronPortInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronSubnetInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronNetworkInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronSecurityGroupInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronSecurityRuleInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronFirewallInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronFirewallPolicyInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronFirewallRuleInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronLoadBalancerInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronLoadBalancerPoolInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronLoadBalancerListenerInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronLoadBalancerHealthMonitorInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronLoadBalancerPoolMemberInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); + NeutronFloatingIPInterface.registerNewInterface(context, dataBroker, translatorCRUDRegistrations); } private void trackService(BundleContext context, final Class clazz, final ConfigInterface... dependents) { diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/NetvirtProvider.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/NetvirtProvider.java index da02d2be8b..099e750ae7 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/NetvirtProvider.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/NetvirtProvider.java @@ -9,35 +9,40 @@ package org.opendaylight.netvirt.openstack.netvirt; import com.google.common.base.Optional; -import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState; -import org.opendaylight.netvirt.openstack.netvirt.api.Constants; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.clustering.Entity; import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; +import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState; +import org.opendaylight.netvirt.openstack.netvirt.api.Constants; import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author Sam Hague (shague@redhat.com) */ -public class NetvirtProvider implements BindingAwareProvider, AutoCloseable { +public class NetvirtProvider implements AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(NetvirtProvider.class); - private BundleContext bundleContext = null; - private static DataBroker dataBroker = null; + private final BundleContext bundleContext; + private final DataBroker dataBroker; private ConfigActivator activator; private static EntityOwnershipService entityOwnershipService; private static final Entity ownerInstanceEntity = new Entity( Constants.NETVIRT_OWNER_ENTITY_TYPE, Constants.NETVIRT_OWNER_ENTITY_TYPE); - private boolean conntrackEnabled = false; + private boolean conntrackEnabled; private boolean intBridgeGenMac; - public NetvirtProvider(BundleContext bundleContext, EntityOwnershipService eos) { - LOG.info("NetvirtProvider: bundleContext: {}", bundleContext); - this.bundleContext = bundleContext; - entityOwnershipService = eos; + public NetvirtProvider(final DataBroker dataBroker, + final EntityOwnershipService eos, + final boolean conntrackEnabled, + final boolean intBridgeGenMac) { + LOG.info("NetvirtProvider started"); + this.dataBroker = dataBroker; + NetvirtProvider.entityOwnershipService = eos; + this.conntrackEnabled = conntrackEnabled; + this.intBridgeGenMac = intBridgeGenMac; + this.bundleContext = FrameworkUtil.getBundle(NetvirtProvider.class).getBundleContext(); } public static boolean isMasterProviderInstance() { @@ -59,15 +64,15 @@ public class NetvirtProvider implements BindingAwareProvider, AutoCloseable { @Override public void close() throws Exception { LOG.info("NetvirtProvider closed"); - activator.stop(bundleContext); + if (activator != null) { + activator.stop(bundleContext); + } } - @Override - public void onSessionInitiated(ProviderContext providerContext) { - dataBroker = providerContext.getSALService(DataBroker.class); + public void start() { LOG.info("NetvirtProvider: onSessionInitiated dataBroker: {}", dataBroker); LOG.info("NetvirtProvider: onSessionInitiated isConntrackEnabled: {}", this.conntrackEnabled); - this.activator = new ConfigActivator(providerContext); + this.activator = new ConfigActivator(dataBroker); activator.setConntrackEnabled(this.conntrackEnabled); activator.setIntBridgeGenMac(this.intBridgeGenMac); try { diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java index aa82c13868..95ba77395d 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/OvsdbInventoryServiceImpl.java @@ -46,13 +46,13 @@ import org.slf4j.LoggerFactory; */ public class OvsdbInventoryServiceImpl implements ConfigInterface, OvsdbInventoryService { private static final Logger LOG = LoggerFactory.getLogger(OvsdbInventoryServiceImpl.class); - private static DataBroker dataBroker = null; + private final DataBroker dataBroker; private static Set ovsdbInventoryListeners = Sets.newCopyOnWriteArraySet(); private OvsdbDataChangeListener ovsdbDataChangeListener = null; private static ClusterAwareMdsalUtils mdsalUtils = null; - public OvsdbInventoryServiceImpl(ProviderContext providerContext) { - dataBroker = providerContext.getSALService(DataBroker.class); + public OvsdbInventoryServiceImpl(final DataBroker dataBroker) { + this.dataBroker = dataBroker; LOG.info("OvsdbInventoryServiceImpl initialized"); ovsdbDataChangeListener = new OvsdbDataChangeListener(dataBroker); mdsalUtils = new ClusterAwareMdsalUtils(dataBroker); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/AbstractNeutronInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/AbstractNeutronInterface.java index 5986d1400b..ec6d02f3b3 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/AbstractNeutronInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/AbstractNeutronInterface.java @@ -8,16 +8,17 @@ package org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.util.concurrent.CheckedFuture; import java.lang.reflect.Method; import java.util.concurrent.ExecutionException; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.netvirt.openstack.netvirt.translator.INeutronObject; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; import org.opendaylight.yangtools.yang.binding.DataObject; @@ -25,10 +26,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.CheckedFuture; - public abstract class AbstractNeutronInterface implements AutoCloseable { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractNeutronInterface.class); @@ -39,10 +36,10 @@ public abstract class AbstractNeutronInterface> registrations) { - NeutronFirewallInterface neutronFirewallInterface = new NeutronFirewallInterface(providerContext); + NeutronFirewallInterface neutronFirewallInterface = new NeutronFirewallInterface(dataBroker); ServiceRegistration neutronFirewallInterfaceRegistration = context.registerService(INeutronFirewallCRUD.class, neutronFirewallInterface, null); if(neutronFirewallInterfaceRegistration != null) { registrations.add(neutronFirewallInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFirewallPolicyInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFirewallPolicyInterface.java index a970cf77b4..a4f4fa8080 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFirewallPolicyInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFirewallPolicyInterface.java @@ -9,11 +9,10 @@ package org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl; import java.util.List; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronFirewallPolicyCRUD; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.netvirt.openstack.netvirt.translator.INeutronObject; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronFirewallPolicy; +import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronFirewallPolicyCRUD; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.osgi.framework.BundleContext; @@ -24,8 +23,8 @@ import org.osgi.framework.ServiceRegistration; public class NeutronFirewallPolicyInterface extends AbstractNeutronInterface implements INeutronFirewallPolicyCRUD { - NeutronFirewallPolicyInterface(ProviderContext providerContext) { - super(providerContext); + NeutronFirewallPolicyInterface(final DataBroker dataBroker) { + super(dataBroker); } @Override @@ -90,9 +89,9 @@ public class NeutronFirewallPolicyInterface extends AbstractNeutronInterface imp } public static void registerNewInterface(BundleContext context, - ProviderContext providerContext, + final DataBroker dataBroker, List> registrations) { - NeutronFirewallPolicyInterface neutronFirewallPolicyInterface = new NeutronFirewallPolicyInterface(providerContext); + NeutronFirewallPolicyInterface neutronFirewallPolicyInterface = new NeutronFirewallPolicyInterface(dataBroker); ServiceRegistration neutronFirewallPolicyInterfaceRegistration = context.registerService(INeutronFirewallPolicyCRUD.class, neutronFirewallPolicyInterface, null); if(neutronFirewallPolicyInterfaceRegistration != null) { registrations.add(neutronFirewallPolicyInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFirewallRuleInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFirewallRuleInterface.java index f54a2221c0..54c4259ca7 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFirewallRuleInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFirewallRuleInterface.java @@ -9,10 +9,9 @@ package org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl; import java.util.List; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronFirewallRule; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.netvirt.openstack.netvirt.translator.INeutronObject; +import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronFirewallRule; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronFirewallRuleCRUD; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -21,8 +20,8 @@ import org.osgi.framework.ServiceRegistration; public class NeutronFirewallRuleInterface extends AbstractNeutronInterface implements INeutronFirewallRuleCRUD { - NeutronFirewallRuleInterface(ProviderContext providerContext) { - super(providerContext); + NeutronFirewallRuleInterface(DataBroker dataBroker) { + super(dataBroker); } @Override @@ -87,9 +86,9 @@ public class NeutronFirewallRuleInterface extends AbstractNeutronInterface imple } public static void registerNewInterface(BundleContext context, - ProviderContext providerContext, + final DataBroker dataBroker, List> registrations) { - NeutronFirewallRuleInterface neutronFirewallRuleInterface = new NeutronFirewallRuleInterface(providerContext); + NeutronFirewallRuleInterface neutronFirewallRuleInterface = new NeutronFirewallRuleInterface(dataBroker); ServiceRegistration neutronFirewallRuleInterfaceRegistration = context.registerService(INeutronFirewallRuleCRUD.class, neutronFirewallRuleInterface, null); if(neutronFirewallRuleInterfaceRegistration != null) { registrations.add(neutronFirewallRuleInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFloatingIPInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFloatingIPInterface.java index a706438466..f0ff374662 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFloatingIPInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFloatingIPInterface.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronFloatingIP; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronFloatingIPCRUD; @@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory; public class NeutronFloatingIPInterface extends AbstractNeutronInterface implements INeutronFloatingIPCRUD { private static final Logger LOGGER = LoggerFactory.getLogger(NeutronFloatingIPInterface.class); - NeutronFloatingIPInterface(ProviderContext providerContext) { - super(providerContext); + NeutronFloatingIPInterface(final DataBroker dataBroker) { + super(dataBroker); } // IfNBFloatingIPCRUD interface methods @@ -173,9 +173,9 @@ public class NeutronFloatingIPInterface extends AbstractNeutronInterface> registrations) { - NeutronFloatingIPInterface neutronFloatingIPInterface = new NeutronFloatingIPInterface(providerContext); + NeutronFloatingIPInterface neutronFloatingIPInterface = new NeutronFloatingIPInterface(dataBroker); ServiceRegistration neutronFloatingIPInterfaceRegistration = context.registerService(INeutronFloatingIPCRUD.class, neutronFloatingIPInterface, null); if (neutronFloatingIPInterfaceRegistration != null) { registrations.add(neutronFloatingIPInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerHealthMonitorInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerHealthMonitorInterface.java index 5dea34924c..81ba7bc925 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerHealthMonitorInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerHealthMonitorInterface.java @@ -9,7 +9,7 @@ package org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl; import java.util.List; - +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronLoadBalancerHealthMonitor; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronLoadBalancerHealthMonitorCRUD; @@ -20,8 +20,8 @@ import org.osgi.framework.ServiceRegistration; public class NeutronLoadBalancerHealthMonitorInterface extends AbstractNeutronInterface implements INeutronLoadBalancerHealthMonitorCRUD { - NeutronLoadBalancerHealthMonitorInterface(ProviderContext providerContext) { - super(providerContext); + NeutronLoadBalancerHealthMonitorInterface(DataBroker dataBroker) { + super(dataBroker); } @Override @@ -89,9 +89,9 @@ public class NeutronLoadBalancerHealthMonitorInterface extends AbstractNeutronIn } public static void registerNewInterface(BundleContext context, - ProviderContext providerContext, + final DataBroker dataBroker, List> registrations) { - NeutronLoadBalancerHealthMonitorInterface neutronLoadBalancerHealthMonitorInterface = new NeutronLoadBalancerHealthMonitorInterface(providerContext); + NeutronLoadBalancerHealthMonitorInterface neutronLoadBalancerHealthMonitorInterface = new NeutronLoadBalancerHealthMonitorInterface(dataBroker); ServiceRegistration neutronLoadBalancerHealthMonitorInterfaceRegistration = context.registerService(INeutronLoadBalancerHealthMonitorCRUD.class, neutronLoadBalancerHealthMonitorInterface, null); if(neutronLoadBalancerHealthMonitorInterfaceRegistration != null) { registrations.add(neutronLoadBalancerHealthMonitorInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerInterface.java index 3820afa65c..bb3e55190c 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerInterface.java @@ -15,8 +15,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronLoadBalancer; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronLoadBalancerCRUD; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; @@ -40,8 +39,8 @@ public class NeutronLoadBalancerInterface extends AbstractNeutronInterface loadBalancerDB = new ConcurrentHashMap<>(); - NeutronLoadBalancerInterface(ProviderContext providerContext) { - super(providerContext); + NeutronLoadBalancerInterface(final DataBroker dataBroker) { + super(dataBroker); } @Override @@ -148,9 +147,9 @@ public class NeutronLoadBalancerInterface extends AbstractNeutronInterface> registrations) { - NeutronLoadBalancerInterface neutronLoadBalancerInterface = new NeutronLoadBalancerInterface(providerContext); + NeutronLoadBalancerInterface neutronLoadBalancerInterface = new NeutronLoadBalancerInterface(dataBroker); ServiceRegistration neutronLoadBalancerInterfaceRegistration = context.registerService(INeutronLoadBalancerCRUD.class, neutronLoadBalancerInterface, null); if(neutronLoadBalancerInterfaceRegistration != null) { registrations.add(neutronLoadBalancerInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerListenerInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerListenerInterface.java index 1d8d064d59..9f506640d2 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerListenerInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerListenerInterface.java @@ -9,7 +9,7 @@ package org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl; import java.util.List; - +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronLoadBalancerListener; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronLoadBalancerListenerCRUD; @@ -20,8 +20,8 @@ import org.osgi.framework.ServiceRegistration; public class NeutronLoadBalancerListenerInterface extends AbstractNeutronInterface implements INeutronLoadBalancerListenerCRUD { - NeutronLoadBalancerListenerInterface(ProviderContext providerContext) { - super(providerContext); + NeutronLoadBalancerListenerInterface(final DataBroker dataBroker) { + super(dataBroker); } @Override @@ -89,9 +89,9 @@ public class NeutronLoadBalancerListenerInterface extends AbstractNeutronInterfa } public static void registerNewInterface(BundleContext context, - ProviderContext providerContext, + final DataBroker dataBroker, List> registrations) { - NeutronLoadBalancerListenerInterface neutronLoadBalancerListenerInterface = new NeutronLoadBalancerListenerInterface(providerContext); + NeutronLoadBalancerListenerInterface neutronLoadBalancerListenerInterface = new NeutronLoadBalancerListenerInterface(dataBroker); ServiceRegistration neutronLoadBalancerListenerInterfaceRegistration = context.registerService(INeutronLoadBalancerListenerCRUD.class, neutronLoadBalancerListenerInterface, null); if(neutronLoadBalancerListenerInterfaceRegistration != null) { registrations.add(neutronLoadBalancerListenerInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerPoolInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerPoolInterface.java index fa4d56d573..0a05ee2a1a 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerPoolInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerPoolInterface.java @@ -8,6 +8,7 @@ package org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl; +import com.google.common.collect.ImmutableBiMap; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -15,12 +16,11 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronLoadBalancerPool; +import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronLoadBalancer_SessionPersistence; import org.opendaylight.netvirt.openstack.netvirt.translator.Neutron_ID; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronLoadBalancerPoolCRUD; -import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronLoadBalancer_SessionPersistence; 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.constants.rev150712.ProtocolBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolHttp; @@ -37,8 +37,6 @@ import org.osgi.framework.ServiceRegistration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableBiMap; - /** * TODO: Migrate this to consume the MD-SAL data store, so that it can read all the data from data store. * No need to worry about the write/update related methods here. OVSDB net-virt will use these CRUD Interface @@ -56,8 +54,8 @@ public class NeutronLoadBalancerPoolInterface extends AbstractNeutronInterface

> registrations) { - NeutronLoadBalancerPoolInterface neutronLoadBalancerPoolInterface = new NeutronLoadBalancerPoolInterface(providerContext); + NeutronLoadBalancerPoolInterface neutronLoadBalancerPoolInterface = new NeutronLoadBalancerPoolInterface(dataBroker); ServiceRegistration neutronLoadBalancerPoolInterfaceRegistration = context.registerService(INeutronLoadBalancerPoolCRUD.class, neutronLoadBalancerPoolInterface, null); if(neutronLoadBalancerPoolInterfaceRegistration != null) { registrations.add(neutronLoadBalancerPoolInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerPoolMemberInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerPoolMemberInterface.java index ef8530c469..fe4584a75a 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerPoolMemberInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronLoadBalancerPoolMemberInterface.java @@ -9,8 +9,7 @@ package org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl; 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.netvirt.openstack.netvirt.translator.NeutronLoadBalancerPoolMember; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronLoadBalancerPoolMemberCRUD; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev150712.lbaas.attributes.pools.pool.Members; @@ -21,8 +20,8 @@ import org.osgi.framework.ServiceRegistration; public class NeutronLoadBalancerPoolMemberInterface extends AbstractNeutronInterface implements INeutronLoadBalancerPoolMemberCRUD { - NeutronLoadBalancerPoolMemberInterface(ProviderContext providerContext) { - super(providerContext); + NeutronLoadBalancerPoolMemberInterface(final DataBroker dataBroker) { + super(dataBroker); } @Override @@ -89,9 +88,9 @@ public class NeutronLoadBalancerPoolMemberInterface extends } public static void registerNewInterface(BundleContext context, - ProviderContext providerContext, + final DataBroker dataBroker, List> registrations) { - NeutronLoadBalancerPoolMemberInterface neutronLoadBalancerPoolMemberInterface = new NeutronLoadBalancerPoolMemberInterface(providerContext); + NeutronLoadBalancerPoolMemberInterface neutronLoadBalancerPoolMemberInterface = new NeutronLoadBalancerPoolMemberInterface(dataBroker); ServiceRegistration neutronLoadBalancerPoolMemberInterfaceRegistration = context.registerService(INeutronLoadBalancerPoolMemberCRUD.class, neutronLoadBalancerPoolMemberInterface, null); if(neutronLoadBalancerPoolMemberInterfaceRegistration != null) { registrations.add(neutronLoadBalancerPoolMemberInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronNetworkInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronNetworkInterface.java index 834256da2d..23a1ef9cd4 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronNetworkInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronNetworkInterface.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronNetwork; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronNetworkCRUD; @@ -51,8 +51,8 @@ public class NeutronNetworkInterface extends AbstractNeutronInterface> registrations) { - NeutronNetworkInterface neutronNetworkInterface = new NeutronNetworkInterface(providerContext); + NeutronNetworkInterface neutronNetworkInterface = new NeutronNetworkInterface(dataBroker); ServiceRegistration neutronNetworkInterfaceRegistration = context.registerService(INeutronNetworkCRUD.class, neutronNetworkInterface, null); if(neutronNetworkInterfaceRegistration != null) { registrations.add(neutronNetworkInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronPortInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronPortInterface.java index 5cb2854d5d..7151ba3ef4 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronPortInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronPortInterface.java @@ -14,17 +14,16 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort_AllowedAddressPairs; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort_ExtraDHCPOption; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort_VIFDetail; +import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityGroup; +import org.opendaylight.netvirt.openstack.netvirt.translator.Neutron_IPs; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronPortCRUD; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityGroupCRUD; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.NeutronCRUDInterfaces; -import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort; -import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityGroup; -import org.opendaylight.netvirt.openstack.netvirt.translator.Neutron_IPs; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; @@ -54,8 +53,8 @@ import org.slf4j.LoggerFactory; public class NeutronPortInterface extends AbstractNeutronInterface implements INeutronPortCRUD { private static final Logger LOGGER = LoggerFactory.getLogger(NeutronPortInterface.class); - NeutronPortInterface(ProviderContext providerContext) { - super(providerContext); + NeutronPortInterface(final DataBroker dataBroker) { + super(dataBroker); } // IfNBPortCRUD methods @@ -334,9 +333,9 @@ public class NeutronPortInterface extends AbstractNeutronInterface> registrations) { - NeutronPortInterface neutronPortInterface = new NeutronPortInterface(providerContext); + NeutronPortInterface neutronPortInterface = new NeutronPortInterface(dataBroker); ServiceRegistration neutronPortInterfaceRegistration = context.registerService(INeutronPortCRUD.class, neutronPortInterface, null); if(neutronPortInterfaceRegistration != null) { registrations.add(neutronPortInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronRouterInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronRouterInterface.java index 12c53647a4..26ec1ddb49 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronRouterInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronRouterInterface.java @@ -9,15 +9,11 @@ package org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Map.Entry; import java.util.Set; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronRouterCRUD; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronRouter; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronRouter_NetworkReference; import org.opendaylight.netvirt.openstack.netvirt.translator.Neutron_IPs; @@ -42,8 +38,8 @@ public class NeutronRouterInterface extends AbstractNeutronInterface> registrations) { - NeutronRouterInterface neutronRouterInterface = new NeutronRouterInterface(providerContext); - ServiceRegistration neutronRouterInterfaceRegistration = context.registerService(INeutronRouterCRUD.class, neutronRouterInterface, null); - if(neutronRouterInterfaceRegistration != null) { - registrations.add(neutronRouterInterfaceRegistration); - } - } + NeutronRouterInterface neutronRouterInterface = new NeutronRouterInterface(dataBroker); + ServiceRegistration neutronRouterInterfaceRegistration = context + .registerService(INeutronRouterCRUD.class,neutronRouterInterface, null); + if (neutronRouterInterfaceRegistration != null) { + registrations.add(neutronRouterInterfaceRegistration); + } + } } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSecurityGroupInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSecurityGroupInterface.java index b1a645bb2d..b8290a6fda 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSecurityGroupInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSecurityGroupInterface.java @@ -12,12 +12,11 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityRuleCRUD; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityGroup; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityRule; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityGroupCRUD; +import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityRuleCRUD; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.NeutronCRUDInterfaces; 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; @@ -35,8 +34,8 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface> registrations) { - NeutronSecurityGroupInterface neutronSecurityGroupInterface = new NeutronSecurityGroupInterface(providerContext); + NeutronSecurityGroupInterface neutronSecurityGroupInterface = new NeutronSecurityGroupInterface(dataBroker); ServiceRegistration neutronSecurityGroupInterfaceRegistration = context.registerService(INeutronSecurityGroupCRUD.class, neutronSecurityGroupInterface, null); if(neutronSecurityGroupInterfaceRegistration != null) { registrations.add(neutronSecurityGroupInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSecurityRuleInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSecurityRuleInterface.java index 7e968e4425..8074dacf27 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSecurityRuleInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSecurityRuleInterface.java @@ -8,16 +8,16 @@ package org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl; +import com.google.common.collect.ImmutableBiMap; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityRuleCRUD; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityGroup; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityRule; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityGroupCRUD; +import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityRuleCRUD; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.NeutronCRUDInterfaces; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.DirectionBase; @@ -43,8 +43,6 @@ import org.osgi.framework.ServiceRegistration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableBiMap; - public class NeutronSecurityRuleInterface extends AbstractNeutronInterface implements INeutronSecurityRuleCRUD { @@ -62,8 +60,8 @@ public class NeutronSecurityRuleInterface extends AbstractNeutronInterface> registrations) { - NeutronSecurityRuleInterface neutronSecurityRuleInterface = new NeutronSecurityRuleInterface(providerContext); + NeutronSecurityRuleInterface neutronSecurityRuleInterface = new NeutronSecurityRuleInterface(dataBroker); ServiceRegistration neutronSecurityRuleInterfaceRegistration = context.registerService(INeutronSecurityRuleCRUD.class, neutronSecurityRuleInterface, null); if(neutronSecurityRuleInterfaceRegistration != null) { registrations.add(neutronSecurityRuleInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSubnetInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSubnetInterface.java index 7b91d77d21..3fd4889f65 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSubnetInterface.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronSubnetInterface.java @@ -8,17 +8,17 @@ package org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl; +import com.google.common.collect.ImmutableBiMap; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSubnetIPAllocationPool; -import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronPortCRUD; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSubnet; +import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSubnetIPAllocationPool; import org.opendaylight.netvirt.openstack.netvirt.translator.Neutron_IPs; +import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronPortCRUD; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSubnetCRUD; import org.opendaylight.netvirt.openstack.netvirt.translator.crud.NeutronCRUDInterfaces; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; @@ -43,8 +43,6 @@ import org.osgi.framework.ServiceRegistration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableBiMap; - public class NeutronSubnetInterface extends AbstractNeutronInterface implements INeutronSubnetCRUD { private static final Logger LOGGER = LoggerFactory.getLogger(NeutronSubnetInterface.class); @@ -62,8 +60,8 @@ public class NeutronSubnetInterface extends AbstractNeutronInterface> registrations) { - NeutronSubnetInterface neutronSubnetInterface = new NeutronSubnetInterface(providerContext); + NeutronSubnetInterface neutronSubnetInterface = new NeutronSubnetInterface(dataBroker); ServiceRegistration neutronSubnetInterfaceRegistration = context.registerService(INeutronSubnetCRUD.class, neutronSubnetInterface, null); if(neutronSubnetInterfaceRegistration != null) { registrations.add(neutronSubnetInterfaceRegistration); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/impl/rev150513/NetvirtImplModule.java b/openstack/net-virt/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/impl/rev150513/NetvirtImplModule.java deleted file mode 100644 index 610f6c15d1..0000000000 --- a/openstack/net-virt/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/impl/rev150513/NetvirtImplModule.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.impl.rev150513; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.netvirt.openstack.netvirt.NetvirtProvider; -import org.osgi.framework.BundleContext; - -public class NetvirtImplModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.impl.rev150513.AbstractNetvirtImplModule { - private BundleContext bundleContext = null; - - public NetvirtImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public NetvirtImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.impl.rev150513.NetvirtImplModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - NetvirtProvider provider = new NetvirtProvider(bundleContext, getClusteringEntityOwnershipServiceDependency()); - provider.setConntrackEnabled(getConntrackEnabled()); - provider.setIntBridgeGenMac(getIntBridgeGenMac()); - BindingAwareBroker localBroker = getBrokerDependency(); - localBroker.registerProvider(provider); - return provider; - } - - public void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } -} diff --git a/openstack/net-virt/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/impl/rev150513/NetvirtImplModuleFactory.java b/openstack/net-virt/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/impl/rev150513/NetvirtImplModuleFactory.java deleted file mode 100644 index 15bf334980..0000000000 --- a/openstack/net-virt/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/impl/rev150513/NetvirtImplModuleFactory.java +++ /dev/null @@ -1,49 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: netvirt-impl yang module local name: netvirt-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Mon May 18 13:02:40 EDT 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.impl.rev150513; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.DynamicMBeanWithInstance; -import org.opendaylight.controller.config.spi.Module; -import org.osgi.framework.BundleContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class NetvirtImplModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.impl.rev150513.AbstractNetvirtImplModuleFactory { - private static final Logger LOG = LoggerFactory.getLogger(NetvirtImplModuleFactory.class); - - @Override - public Module createModule(String instanceName, - DependencyResolver dependencyResolver, - DynamicMBeanWithInstance old, BundleContext bundleContext) - throws Exception { - Module module = super.createModule(instanceName, dependencyResolver, old, bundleContext); - setModuleBundleContext(bundleContext, module); - return module; - } - - @Override - public Module createModule(String instanceName, - DependencyResolver dependencyResolver, BundleContext bundleContext) { - Module module = super.createModule(instanceName, dependencyResolver, bundleContext); - setModuleBundleContext(bundleContext, module); - return module; - } - - private void setModuleBundleContext(BundleContext bundleContext, - Module module) { - if (module instanceof NetvirtImplModule) { - ((NetvirtImplModule)module).setBundleContext(bundleContext); - } else { - LOG.warn("Module is of type {} expected type {}", - module.getClass(), NetvirtImplModule.class); - } - } -} diff --git a/openstack/net-virt/src/main/resources/org/opendaylight/blueprint/netvirt-impl.xml b/openstack/net-virt/src/main/resources/org/opendaylight/blueprint/netvirt-impl.xml new file mode 100644 index 0000000000..821de54219 --- /dev/null +++ b/openstack/net-virt/src/main/resources/org/opendaylight/blueprint/netvirt-impl.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/openstack/net-virt/src/main/yang/netvirt-impl-config.yang b/openstack/net-virt/src/main/yang/netvirt-impl-config.yang new file mode 100644 index 0000000000..474f63041c --- /dev/null +++ b/openstack/net-virt/src/main/yang/netvirt-impl-config.yang @@ -0,0 +1,24 @@ +module netvirt-impl-config { + yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:netvirt:impl:config"; + prefix "netvirt-impl-config"; + + description + "Configuration for Netvirt Impl."; + + revision "2016-05-17" { + description + "Initial revision."; + } + + container netvirt-impl-config { + leaf conntrack-enabled { + type boolean; + default false; + } + leaf int-bridge-gen-mac { + type boolean; + default true; + } + } +} diff --git a/openstack/net-virt/src/main/yang/netvirt-impl.yang b/openstack/net-virt/src/main/yang/netvirt-impl.yang deleted file mode 100644 index 6883edce43..0000000000 --- a/openstack/net-virt/src/main/yang/netvirt-impl.yang +++ /dev/null @@ -1,51 +0,0 @@ -module netvirt-impl { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:netvirt:impl"; - prefix "netvirt-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} - import opendaylight-entity-ownership-service {prefix eos; revision-date 2015-08-10;} - - description - "Service definition for netvirt project"; - - revision "2015-05-13" { - description - "Initial revision"; - } - - identity netvirt-impl { - base config:module-type; - config:java-name-prefix netvirtImpl; - } - - augment "/config:modules/config:module/config:configuration" { - case netvirt-impl { - when "/config:modules/config:module/config:type = 'netvirt-impl'"; - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity md-sal-binding:binding-broker-osgi-registry; - } - } - } - container clustering-entity-ownership-service { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity eos:entity-ownership-service; - } - } - } - leaf conntrack-enabled { - type boolean; - } - - leaf int-bridge-gen-mac { - type boolean; - } - } - } -} \ No newline at end of file diff --git a/openstack/net-virt/src/test/java/org/opendaylight/netvirt/openstack/netvirt/impl/OvsdbInventoryServiceImplTest.java b/openstack/net-virt/src/test/java/org/opendaylight/netvirt/openstack/netvirt/impl/OvsdbInventoryServiceImplTest.java index 82a84841df..5c3b922fde 100644 --- a/openstack/net-virt/src/test/java/org/opendaylight/netvirt/openstack/netvirt/impl/OvsdbInventoryServiceImplTest.java +++ b/openstack/net-virt/src/test/java/org/opendaylight/netvirt/openstack/netvirt/impl/OvsdbInventoryServiceImplTest.java @@ -12,12 +12,11 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import java.util.Set; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.runners.MockitoJUnitRunner; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.netvirt.openstack.netvirt.api.OvsdbInventoryListener; /** @@ -26,7 +25,7 @@ import org.opendaylight.netvirt.openstack.netvirt.api.OvsdbInventoryListener; @RunWith(MockitoJUnitRunner.class) public class OvsdbInventoryServiceImplTest { - @InjectMocks private OvsdbInventoryServiceImpl ovsdbInventoryServiceImpl = new OvsdbInventoryServiceImpl(mock(ProviderContext.class)); + @InjectMocks private OvsdbInventoryServiceImpl ovsdbInventoryServiceImpl = new OvsdbInventoryServiceImpl(mock(DataBroker.class)); @Test diff --git a/openstack/net-virt/src/test/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFloatingIPInterfaceTest.java b/openstack/net-virt/src/test/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFloatingIPInterfaceTest.java index fdb01e2da6..5946762edc 100644 --- a/openstack/net-virt/src/test/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFloatingIPInterfaceTest.java +++ b/openstack/net-virt/src/test/java/org/opendaylight/netvirt/openstack/netvirt/translator/crud/impl/NeutronFloatingIPInterfaceTest.java @@ -14,19 +14,13 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.List; - import org.junit.Test; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronFloatingIP; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; @@ -55,9 +49,7 @@ public class NeutronFloatingIPInterfaceTest extends AbstractDataBrokerTest { private static final String STATUS = "ACTIVE"; private NeutronFloatingIPInterface getTestInterface(DataBroker broker) { - ProviderContext providerContext = mock(ProviderContext.class); - when(providerContext.getSALService(DataBroker.class)).thenReturn(broker); - return new NeutronFloatingIPInterface(providerContext); + return new NeutronFloatingIPInterface(broker); } /**