From b95fedf258c92e81bb19513825215f977ac488e2 Mon Sep 17 00:00:00 2001 From: Matej Perina Date: Thu, 18 Aug 2016 17:44:50 +0200 Subject: [PATCH] BUG 6396 ios-xe-renderer migration to blueprint Change-Id: I659ce1afe123f8184717fc90238f2b868ece12f3 Signed-off-by: Matej Perina --- .../ios-xe/src/main/config/default-config.xml | 15 ---------- .../impl/config/IosXeProviderInstance.java | 28 +++++++++++++++++++ .../impl/config/IosXeProviderModule.java | 4 +-- .../blueprint/ios-xe-renderer.xml | 14 ++++++++++ .../src/main/yang/ios-xe-provider-impl.yang | 28 ------------------- 5 files changed, 44 insertions(+), 45 deletions(-) create mode 100644 renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderInstance.java create mode 100644 renderers/ios-xe/src/main/resources/org/opendaylight/blueprint/ios-xe-renderer.xml diff --git a/renderers/ios-xe/src/main/config/default-config.xml b/renderers/ios-xe/src/main/config/default-config.xml index a22f5c7ab..6d901c700 100755 --- a/renderers/ios-xe/src/main/config/default-config.xml +++ b/renderers/ios-xe/src/main/config/default-config.xml @@ -18,21 +18,6 @@ iosxe:ios-xe-provider-impl ios-xe-provider-impl - - - binding:binding-async-data-broker - binding-data-broker - - - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - - gbp:policy-validator-registry - policy-validator-registry - diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderInstance.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderInstance.java new file mode 100644 index 000000000..6cacbf395 --- /dev/null +++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderInstance.java @@ -0,0 +1,28 @@ +/* + * 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.groupbasedpolicy.renderer.ios_xe_provider.impl.config; + +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; +import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.IosXeRendererProviderImpl; + +public class IosXeProviderInstance implements AutoCloseable{ + + private IosXeRendererProviderImpl renderer; + + public IosXeProviderInstance(DataBroker dataBroker, BindingAwareBroker broker) { + renderer = new IosXeRendererProviderImpl(dataBroker, broker); + } + + @Override + public void close() throws Exception { + renderer.close(); + } + +} diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java index b49b0dc0f..b64968dfc 100644 --- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java +++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java @@ -8,7 +8,7 @@ package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.config; -import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.IosXeRendererProviderImpl; +import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; public class IosXeProviderModule extends org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.config.AbstractIosXeProviderModule { public IosXeProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { @@ -26,7 +26,7 @@ public class IosXeProviderModule extends org.opendaylight.groupbasedpolicy.rende @Override public java.lang.AutoCloseable createInstance() { - return new IosXeRendererProviderImpl(getDataBrokerDependency(), getBrokerDependency()); + return NoopAutoCloseable.INSTANCE; } } diff --git a/renderers/ios-xe/src/main/resources/org/opendaylight/blueprint/ios-xe-renderer.xml b/renderers/ios-xe/src/main/resources/org/opendaylight/blueprint/ios-xe-renderer.xml new file mode 100644 index 000000000..06db22ff7 --- /dev/null +++ b/renderers/ios-xe/src/main/resources/org/opendaylight/blueprint/ios-xe-renderer.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang b/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang index 423d8feed..a27719fe4 100755 --- a/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang +++ b/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang @@ -34,34 +34,6 @@ module ios-xe-provider-impl { augment "/config:modules/config:module/config:configuration" { case ios-xe-provider-impl { when "/config:modules/config:module/config:type = 'ios-xe-provider-impl'"; - - // Wires in the data-broker service - container data-broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity mdsal:binding-async-data-broker; - } - } - } - // binding aware broker - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity mdsal:binding-broker-osgi-registry; - } - } - } - // PolicyProviderRegistry service - container policy-validator-registry { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity gbpcfg:policy-validator-registry; - } - } - } } } } -- 2.36.6