From 3dcceca419f4b20fe1eae1aaa4279bee498b5555 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Tue, 17 May 2016 13:41:00 -0400 Subject: [PATCH] Add blueprint wiring for neutron renderer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I00fcd2f7d661ec38802974fc39da4a4009b37d43 Signed-off-by: Alexis de Talhouët --- features/pom.xml | 7 -- features/src/main/features/features.xml | 1 - .../src/main/config/default-config.xml | 29 -------- .../netvirt/renderers/neutron/Constants.java | 9 ++- .../neutron/DelegatingDataTreeListener.java | 4 +- .../renderers/neutron/MdsalHelper.java | 3 - .../neutron/NeutronNetworkChangeListener.java | 5 +- .../neutron/NeutronNetworkDataProcessor.java | 5 +- .../neutron/NeutronPortChangeListener.java | 5 +- .../neutron/NeutronPortDataProcessor.java | 5 +- .../renderers/neutron/NeutronProvider.java | 70 ------------------- .../neutron/rev160308/NeutronModule.java | 33 --------- .../rev160308/NeutronModuleFactory.java | 19 ----- .../org/opendaylight/blueprint/netvirt.xml | 21 ++++++ .../src/main/yang/netvirt-neutron.yang | 36 ---------- .../neutron/NeutronPortDataProcessorTest.java | 13 ++-- .../neutron/NeutronProviderTest.java | 38 ---------- .../rev160308/NeutronModuleFactoryTest.java | 18 ----- .../neutron/rev160308/NeutronModuleTest.java | 54 -------------- 19 files changed, 41 insertions(+), 334 deletions(-) delete mode 100644 netvirt/renderers/neutron/src/main/config/default-config.xml delete mode 100644 netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronProvider.java delete mode 100644 netvirt/renderers/neutron/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModule.java delete mode 100644 netvirt/renderers/neutron/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleFactory.java create mode 100644 netvirt/renderers/neutron/src/main/resources/org/opendaylight/blueprint/netvirt.xml delete mode 100644 netvirt/renderers/neutron/src/main/yang/netvirt-neutron.yang delete mode 100644 netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronProviderTest.java delete mode 100644 netvirt/renderers/neutron/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleFactoryTest.java delete mode 100644 netvirt/renderers/neutron/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleTest.java diff --git a/features/pom.xml b/features/pom.xml index 899593b540..821a09ceb2 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -241,13 +241,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html neutron ${project.version} - - ${project.groupId} - neutron - ${project.version} - xml - config - org.opendaylight.dlux features-dlux diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml index 187238100d..a44b706359 100644 --- a/features/src/main/features/features.xml +++ b/features/src/main/features/features.xml @@ -75,7 +75,6 @@ mvn:org.opendaylight.netvirt/utils.mdsal-utils/{{VERSION}} mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}} mvn:org.opendaylight.netvirt/neutron/{{VERSION}} - mvn:org.opendaylight.netvirt/neutron/{{VERSION}}/xml/config diff --git a/netvirt/renderers/neutron/src/main/config/default-config.xml b/netvirt/renderers/neutron/src/main/config/default-config.xml deleted file mode 100644 index 7cb1144618..0000000000 --- a/netvirt/renderers/neutron/src/main/config/default-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - urn:opendaylight:params:xml:ns:yang:netvirt:neutron?module=netvirt-neutron&revision=2016-03-08 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - - - - - - prefix:netvirt-neutron - netvirt-neutron - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - - - - diff --git a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/Constants.java b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/Constants.java index a47ce6694e..f4bfd00d6c 100644 --- a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/Constants.java +++ b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/Constants.java @@ -9,15 +9,18 @@ package org.opendaylight.netvirt.netvirt.renderers.neutron; import com.google.common.collect.ImmutableBiMap; -import com.google.common.collect.ImmutableBiMap.Builder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.common.rev151227.*; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.common.rev151227.NetworkTypeBase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.common.rev151227.NetworkTypeFlat; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.common.rev151227.NetworkTypeGre; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.common.rev151227.NetworkTypeVlan; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.common.rev151227.NetworkTypeVxlan; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.PortTypeBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.PortTypeComputeNova; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.PortTypeDhcp; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.PortTypeFloatingIp; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.PortTypeRouter; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.PortTypeRouterGateway; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.PortTypeRouterInterfaceDistributed; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.PortTypeRouter; /** * A collection of configuration constants diff --git a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/DelegatingDataTreeListener.java b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/DelegatingDataTreeListener.java index fd35781193..51e5e272bc 100644 --- a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/DelegatingDataTreeListener.java +++ b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/DelegatingDataTreeListener.java @@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory; */ public class DelegatingDataTreeListener implements AutoCloseable, ClusteredDataTreeChangeListener { private static final Logger LOG = LoggerFactory.getLogger(DelegatingDataTreeListener.class); - protected NeutronProvider provider; protected DataBroker db; private static final ThreadFactory threadFactory = new ThreadFactoryBuilder() .setNameFormat("NV-NeutronDTL-%d").build(); @@ -36,9 +35,8 @@ public class DelegatingDataTreeListener implements AutoClo private final DataProcessor dataProcessor; private ListenerRegistration> listenerRegistration; - public DelegatingDataTreeListener(NeutronProvider provider, DataProcessor dataProcessor, + public DelegatingDataTreeListener(DataProcessor dataProcessor, DataBroker db, DataTreeIdentifier treeId) { - this.provider = Preconditions.checkNotNull(provider, "provider can not be null!"); this.dataProcessor = Preconditions.checkNotNull(dataProcessor, "Data processor can not be null!"); registerListener(Preconditions.checkNotNull(db, "Data broker can not be null!"), Preconditions.checkNotNull(treeId, "Tree identifier can not be null!")); diff --git a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/MdsalHelper.java b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/MdsalHelper.java index 18923a6813..3e52e542bc 100644 --- a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/MdsalHelper.java +++ b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/MdsalHelper.java @@ -19,11 +19,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.Por import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.ports.Port; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.ports.PortKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class MdsalHelper { - private static final Logger LOG = LoggerFactory.getLogger(MdsalHelper.class); public static InstanceIdentifier createPortInstanceIdentifier(Uuid portUuid) { return InstanceIdentifier.create(Ports.class) .child(Port.class, new PortKey(portUuid)); diff --git a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronNetworkChangeListener.java b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronNetworkChangeListener.java index afbe7a9427..79df947274 100644 --- a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronNetworkChangeListener.java +++ b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronNetworkChangeListener.java @@ -21,11 +21,10 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class NeutronNetworkChangeListener extends DelegatingDataTreeListener { /** * {@link NeutronNetworkChangeListener} constructor. - * @param provider Neutron Provider * @param db MdSal {@link DataBroker} */ - public NeutronNetworkChangeListener(final NeutronProvider provider, final DataBroker db) { - super(provider, new NeutronNetworkDataProcessor(provider, db), db, + public NeutronNetworkChangeListener(final DataBroker db) { + super(new NeutronNetworkDataProcessor(db), db, new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Neutron.class).child(Networks.class).child(Network.class))); } diff --git a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronNetworkDataProcessor.java b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronNetworkDataProcessor.java index e83a6c16d5..bed87c64ce 100644 --- a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronNetworkDataProcessor.java +++ b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronNetworkDataProcessor.java @@ -28,15 +28,12 @@ import org.slf4j.LoggerFactory; public class NeutronNetworkDataProcessor implements DataProcessor { private static final Logger LOG = LoggerFactory.getLogger(NeutronNetworkDataProcessor.class); private final MdsalUtils mdsalUtils; - private final NeutronProvider provider; /** * - * @param provider - Neutron provider * @param db - mdsal */ - public NeutronNetworkDataProcessor(final NeutronProvider provider, DataBroker db) { - this.provider = Preconditions.checkNotNull(provider, "Provider can not be null!"); + public NeutronNetworkDataProcessor(DataBroker db) { mdsalUtils = new MdsalUtils(db); } diff --git a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortChangeListener.java b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortChangeListener.java index 8ac6eddd39..83ffac2700 100644 --- a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortChangeListener.java +++ b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortChangeListener.java @@ -21,11 +21,10 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class NeutronPortChangeListener extends DelegatingDataTreeListener { /** * {@link NeutronPortChangeListener} constructor. - * @param provider Neutron Provider * @param db MdSal {@link DataBroker} */ - public NeutronPortChangeListener(final NeutronProvider provider, final DataBroker db) { - super(provider, new NeutronPortDataProcessor(provider, db), db, + public NeutronPortChangeListener(final DataBroker db) { + super(new NeutronPortDataProcessor(db), db, new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Neutron.class).child(Ports.class).child(Port.class))); } diff --git a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessor.java b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessor.java index 6d5e76bb2d..54d16b69ea 100644 --- a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessor.java +++ b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessor.java @@ -35,15 +35,12 @@ import org.slf4j.LoggerFactory; public class NeutronPortDataProcessor implements DataProcessor { private static final Logger LOG = LoggerFactory.getLogger(NeutronPortDataProcessor.class); private MdsalUtils mdsalUtils; - private final NeutronProvider provider; /** * - * @param provider - Neutron provider * @param db - mdsal */ - public NeutronPortDataProcessor(final NeutronProvider provider, DataBroker db) { - this.provider = Preconditions.checkNotNull(provider, "Provider can not be null!"); + public NeutronPortDataProcessor(DataBroker db) { mdsalUtils = new MdsalUtils(db); } diff --git a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronProvider.java b/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronProvider.java deleted file mode 100644 index 41f33f3b85..0000000000 --- a/netvirt/renderers/neutron/src/main/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronProvider.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2016 Red Hat, Inc. and others. All rights reserved. - * - * 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 - */ -package org.opendaylight.netvirt.netvirt.renderers.neutron; - -import com.google.common.base.Optional; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState; -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.osgi.framework.BundleContext; - -public class NeutronProvider implements BindingAwareProvider, AutoCloseable { - private static final Logger LOG = LoggerFactory.getLogger(NeutronProvider.class); - private BundleContext bundleContext = null; - private static DataBroker dataBroker = null; - private static EntityOwnershipService entityOwnershipService; - private static final Entity ownerInstanceEntity = new Entity(Constants.NETVIRT_NEUTRON_OWNER_ENTITY_TYPE, - Constants.NETVIRT_NEUTRON_OWNER_ENTITY_TYPE); - private NeutronPortChangeListener neutronPortChangeListener; - private NeutronNetworkChangeListener neutronNetworkChangeListener; - - public NeutronProvider(BundleContext bundleContext, EntityOwnershipService eos) { - LOG.info("Netvirt NeutronProvider: bundleContext: {}", bundleContext); - this.bundleContext = bundleContext; - entityOwnershipService = eos; - } - - public NeutronProvider() { - LOG.info("Netvirt NeutronProvider created"); - } - - public static boolean isMasterProviderInstance() { - if (entityOwnershipService != null) { - Optional state = entityOwnershipService.getOwnershipState(ownerInstanceEntity); - return state.isPresent() && state.get().isOwner(); - } - return false; - } - - - @Override - public void onSessionInitiated(ProviderContext providerContext) { - dataBroker = providerContext.getSALService(DataBroker.class); - LOG.info("Netvirt NeutronProvider: onSessionInitiated dataBroker: {}", dataBroker); - - neutronPortChangeListener = new NeutronPortChangeListener(this, dataBroker); - neutronNetworkChangeListener = new NeutronNetworkChangeListener(this, dataBroker); - } - - @Override - public void close() throws Exception { - if (neutronPortChangeListener != null) { - neutronPortChangeListener.close(); - } - if (neutronNetworkChangeListener != null) { - neutronNetworkChangeListener.close(); - } - LOG.info("Netvirt NeutronProvider Closed"); - } - -} diff --git a/netvirt/renderers/neutron/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModule.java b/netvirt/renderers/neutron/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModule.java deleted file mode 100644 index 52cc310772..0000000000 --- a/netvirt/renderers/neutron/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModule.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016 Red Hat, Inc. and others. All rights reserved. - * - * 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 - */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.neutron.rev160308; - -import org.opendaylight.netvirt.netvirt.renderers.neutron.NeutronProvider; - -public class NeutronModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.neutron.rev160308.AbstractNeutronModule { - public NeutronModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public NeutronModule(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.neutron.rev160308.NeutronModule 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() { - NeutronProvider provider = new NeutronProvider(); - getBrokerDependency().registerProvider(provider); - return provider; - } - -} diff --git a/netvirt/renderers/neutron/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleFactory.java b/netvirt/renderers/neutron/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleFactory.java deleted file mode 100644 index 98cd54a385..0000000000 --- a/netvirt/renderers/neutron/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2016 Red Hat, Inc. and others. All rights reserved. - * - * 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 - */ -/* -* Generated file -* -* Generated from: yang module name: neutron yang module local name: neutron -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* -* 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.neutron.rev160308; -public class NeutronModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.neutron.rev160308.AbstractNeutronModuleFactory { - -} diff --git a/netvirt/renderers/neutron/src/main/resources/org/opendaylight/blueprint/netvirt.xml b/netvirt/renderers/neutron/src/main/resources/org/opendaylight/blueprint/netvirt.xml new file mode 100644 index 0000000000..c9d1574d90 --- /dev/null +++ b/netvirt/renderers/neutron/src/main/resources/org/opendaylight/blueprint/netvirt.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/netvirt/renderers/neutron/src/main/yang/netvirt-neutron.yang b/netvirt/renderers/neutron/src/main/yang/netvirt-neutron.yang deleted file mode 100644 index 85f78882c2..0000000000 --- a/netvirt/renderers/neutron/src/main/yang/netvirt-neutron.yang +++ /dev/null @@ -1,36 +0,0 @@ -module netvirt-neutron { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:netvirt:neutron"; - prefix "neutron"; - - 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 Neutron renderer"; - - revision "2016-03-08" { - description - "Initial revision"; - } - - identity netvirt-neutron { - base config:module-type; - config:java-name-prefix Neutron; - } - - augment "/config:modules/config:module/config:configuration" { - case netvirt-neutron { - when "/config:modules/config:module/config:type = 'netvirt-neutron'"; - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity md-sal-binding:binding-broker-osgi-registry; - } - } - } - } - } -} diff --git a/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessorTest.java b/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessorTest.java index d3295615ee..f63f1d6556 100644 --- a/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessorTest.java +++ b/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronPortDataProcessorTest.java @@ -1,9 +1,12 @@ package org.opendaylight.netvirt.netvirt.renderers.neutron; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.base.Optional; import java.util.ArrayList; import java.util.List; import org.junit.Test; @@ -16,11 +19,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types. 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.ports.rev150712.port.attributes.FixedIps; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.port.attributes.FixedIpsBuilder; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.PortBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports; -import com.google.common.base.Optional; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * Unit test for {@link NeutronPortDataProcessor} @@ -37,7 +39,6 @@ public class NeutronPortDataProcessorTest extends AbstractDataBrokerTest { InstanceIdentifier portIid = MdsalHelper.createPortInstanceIdentifier(uuid); - org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.ports.rev151227.ports.Port netvirtPort = null; Optional data = getDataBroker() .newReadOnlyTransaction() @@ -71,7 +72,7 @@ public class NeutronPortDataProcessorTest extends AbstractDataBrokerTest { if (!initialized) { session = mock(ProviderContext.class); when(session.getSALService(DataBroker.class)).thenReturn(getDataBroker()); - neutronPortDataProcessor = new NeutronPortDataProcessor(new NeutronProvider(), session.getSALService(DataBroker.class)); + neutronPortDataProcessor = new NeutronPortDataProcessor(getDataBroker()); initialized = true; } } diff --git a/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronProviderTest.java b/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronProviderTest.java deleted file mode 100644 index dbcc924dae..0000000000 --- a/netvirt/renderers/neutron/src/test/java/org/opendaylight/netvirt/netvirt/renderers/neutron/NeutronProviderTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2016 Red Hat, Inc. and others. All rights reserved. - * - * 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 - */ -package org.opendaylight.netvirt.netvirt.renderers.neutron; - -import org.junit.Test; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; - -import static org.mockito.Mockito.mock; - -public class NeutronProviderTest { - @Test - public void testOnSessionInitiated() { - - NeutronProvider provider = new NeutronProvider(); - - // ensure no exceptions - // currently this method is empty - - //TODO - //provider.onSessionInitiated(mock(BindingAwareBroker.ProviderContext.class)); - } - - @Test - public void testClose() throws Exception { - NeutronProvider provider = new NeutronProvider(); - - // ensure no exceptions - // currently this method is empty - provider.close(); - } -} diff --git a/netvirt/renderers/neutron/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleFactoryTest.java b/netvirt/renderers/neutron/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleFactoryTest.java deleted file mode 100644 index 76bf797f08..0000000000 --- a/netvirt/renderers/neutron/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleFactoryTest.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2016 Red Hat, Inc. and others. All rights reserved. - * - * 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 - */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.neutron.rev160308; - -import org.junit.Test; - -public class NeutronModuleFactoryTest { - @Test - public void testFactoryConstructor() { - // ensure no exceptions on construction - new NeutronModuleFactory(); - } -} diff --git a/netvirt/renderers/neutron/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleTest.java b/netvirt/renderers/neutron/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleTest.java deleted file mode 100644 index 46b2228396..0000000000 --- a/netvirt/renderers/neutron/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/netvirt/neutron/rev160308/NeutronModuleTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2016 Red Hat, Inc. and others. All rights reserved. - * - * 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 - */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.neutron.rev160308; - -import org.junit.Test; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.JmxAttribute; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.netvirt.netvirt.renderers.neutron.NeutronProvider; - -import javax.management.ObjectName; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class NeutronModuleTest { - @Test - public void testCustomValidation() { - NeutronModule module = new NeutronModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class)); - - // ensure no exceptions on validation - // currently this method is empty - module.customValidation(); - } - - @Test - public void testCreateInstance() throws Exception { - // configure mocks - DependencyResolver dependencyResolver = mock(DependencyResolver.class); - BindingAwareBroker broker = mock(BindingAwareBroker.class); - when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker); - - // create instance of module with injected mocks - NeutronModule module = new NeutronModule(mock(ModuleIdentifier.class), dependencyResolver); - - // getInstance calls resolveInstance to get the broker dependency and then calls createInstance - AutoCloseable closeable = module.getInstance(); - - // verify that the module registered the returned provider with the broker - verify(broker).registerProvider((NeutronProvider)closeable); - - // ensure no exceptions on close - closeable.close(); - } -} -- 2.36.6