From 16e92eeeace1dc87771677d5393f30cc63e18285 Mon Sep 17 00:00:00 2001 From: Matej Perina Date: Thu, 18 Aug 2016 13:34:36 +0200 Subject: [PATCH] BUG 6396 neutron-vpp-mapper project migration to blueprint Change-Id: Ia14152df19ad51b684f6c9e4f10669ac37de0e58 Signed-off-by: Matej Perina --- .../src/main/config/default-config.xml | 8 ----- .../impl/NeutronVppMapperInstance.java | 26 ++++++++++++++++ .../impl/NeutronVppMapperModule.java | 7 ++--- .../blueprint/neutron-vpp-mapper.xml | 14 +++++++++ .../main/yang/neutron-vpp-mapper-impl.yang | 30 ------------------- 5 files changed, 42 insertions(+), 43 deletions(-) create mode 100644 neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperInstance.java create mode 100644 neutron-vpp-mapper/src/main/resources/org/opendaylight/blueprint/neutron-vpp-mapper.xml diff --git a/neutron-vpp-mapper/src/main/config/default-config.xml b/neutron-vpp-mapper/src/main/config/default-config.xml index 2a196a59c..224490950 100644 --- a/neutron-vpp-mapper/src/main/config/default-config.xml +++ b/neutron-vpp-mapper/src/main/config/default-config.xml @@ -15,14 +15,6 @@ neutron-vpp-mapper:neutron-vpp-mapper-impl neutron-vpp-mapper-impl - - binding:binding-rpc-registry - binding-rpc-broker - - - binding:binding-async-data-broker - binding-data-broker - diff --git a/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperInstance.java b/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperInstance.java new file mode 100644 index 000000000..f9a78fcaa --- /dev/null +++ b/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperInstance.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2016 Cisco Systems, 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.controller.config.yang.config.neutron_vpp_mapper.impl; + +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.NeutronVppMapper; + +public class NeutronVppMapperInstance implements AutoCloseable{ + + private NeutronVppMapper mapper; + + public NeutronVppMapperInstance (DataBroker dataBroker, String socketPath, String socketPrefix) { + mapper = new NeutronVppMapper(socketPath, socketPrefix, dataBroker); + } + + @Override + public void close() throws Exception { + mapper.close(); + } +} diff --git a/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModule.java b/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModule.java index e8a60b4d1..b458050fd 100644 --- a/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModule.java +++ b/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModule.java @@ -8,7 +8,7 @@ package org.opendaylight.controller.config.yang.config.neutron_vpp_mapper.impl; -import org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.NeutronVppMapper; +import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; public class NeutronVppMapperModule extends org.opendaylight.controller.config.yang.config.neutron_vpp_mapper.impl.AbstractNeutronVppMapperModule { public NeutronVppMapperModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { @@ -25,10 +25,7 @@ public class NeutronVppMapperModule extends org.opendaylight.controller.config.y @Override public java.lang.AutoCloseable createInstance() { - String vhostSocketPath = getVhostSocketPath(); - String vhostSocketPrefix = getVhostSocketPrefix(); - NeutronVppMapper neutronVppMapper = new NeutronVppMapper(vhostSocketPath, vhostSocketPrefix, getDataBrokerDependency()); - return neutronVppMapper; + return NoopAutoCloseable.INSTANCE; } } diff --git a/neutron-vpp-mapper/src/main/resources/org/opendaylight/blueprint/neutron-vpp-mapper.xml b/neutron-vpp-mapper/src/main/resources/org/opendaylight/blueprint/neutron-vpp-mapper.xml new file mode 100644 index 000000000..64f8891c5 --- /dev/null +++ b/neutron-vpp-mapper/src/main/resources/org/opendaylight/blueprint/neutron-vpp-mapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/neutron-vpp-mapper/src/main/yang/neutron-vpp-mapper-impl.yang b/neutron-vpp-mapper/src/main/yang/neutron-vpp-mapper-impl.yang index cac643d80..0ae253bc6 100644 --- a/neutron-vpp-mapper/src/main/yang/neutron-vpp-mapper-impl.yang +++ b/neutron-vpp-mapper/src/main/yang/neutron-vpp-mapper-impl.yang @@ -36,36 +36,6 @@ module neutron-vpp-mapper-impl { augment "/config:modules/config:module/config:configuration" { case neutron-vpp-mapper-impl { when "/config:modules/config:module/config:type = 'neutron-vpp-mapper-impl'"; - - container data-broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity mdsal:binding-async-data-broker; - } - } - } - - container rpc-registry { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity mdsal:binding-rpc-registry; - } - } - } - - leaf vhostSocketPath { - description "Base system directory path for the vhost user host socket filehandle"; - type string; - default "/tmp/"; - } - - leaf vhostSocketPrefix { - description "Prefix for the vhost user host socket filehandle"; - type string; - default "socket_"; - } } } } \ No newline at end of file -- 2.36.6