From: Tom Pantelis Date: Thu, 8 Jun 2017 12:40:44 +0000 (-0400) Subject: Remove config yang/module from sal-cluster-admin-impl X-Git-Tag: release/nitrogen~134 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b3e258b9dc01140ce670cf24c5d614a2f18f9b63 Remove config yang/module from sal-cluster-admin-impl The module was a no-op but was kept for backwards compatibility for the uber controller.currentconfig.xml but, since netconf was converted to use the DS a couple releases ago, it should be ok to remove it. Change-Id: Ib631658bcf5abc77231e8195112964208d3465a6 Signed-off-by: Tom Pantelis --- diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml index 073e4e175c..80bd141bbe 100644 --- a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml +++ b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml @@ -2,16 +2,29 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - ../../config/config-parent + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT + + org.opendaylight.controller sal-cluster-admin-impl 1.6.0-SNAPSHOT bundle + + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + + org.opendaylight.controller @@ -81,10 +94,6 @@ - - org.opendaylight.controller - config-api - org.opendaylight.controller sal-binding-api diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java deleted file mode 100644 index d8d0613598..0000000000 --- a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModule.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2015 Brocade Communications 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.cluster_admin_provider; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; - -public class ClusterAdminProviderModule extends AbstractClusterAdminProviderModule { - public ClusterAdminProviderModule(ModuleIdentifier identifier, DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public ClusterAdminProviderModule(ModuleIdentifier identifier, DependencyResolver dependencyResolver, - ClusterAdminProviderModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public boolean canReuseInstance(AbstractClusterAdminProviderModule oldModule) { - return true; - } - - @Override - public AutoCloseable createInstance() { - // The ClusterAdminRpcService is created via blueprint so return a noop here for backwards compatibility. - return NoopAutoCloseable.INSTANCE; - } -} diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModuleFactory.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModuleFactory.java deleted file mode 100644 index ea0ed437b8..0000000000 --- a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/config/yang/config/cluster_admin_provider/ClusterAdminProviderModuleFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2015 Brocade Communications 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 - */ - -/* -* Generated file -* -* Generated from: yang module name: cluster-admin-provider yang module local name: cluster-admin-provider -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Tue Nov 03 02:34:10 EST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.cluster_admin_provider; - -public class ClusterAdminProviderModuleFactory extends AbstractClusterAdminProviderModuleFactory { - -} diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/yang/cluster-admin-service.yang b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/yang/cluster-admin-service.yang deleted file mode 100644 index 6288f27717..0000000000 --- a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/yang/cluster-admin-service.yang +++ /dev/null @@ -1,56 +0,0 @@ -module cluster-admin-provider { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:cluster-admin-provider"; - prefix "cluster-admin-provider"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-operational-dom-datastore {prefix operational-dom-store-spi;} - import opendaylight-config-dom-datastore {prefix config-dom-store-spi;} - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - - description - "This module contains the configuration YANG definitions for the ClusterAdminRpcService implementation"; - - revision "2015-10-13" { - description "Initial revision."; - } - - // This is the definition of the provider implementation as a module identity. - identity cluster-admin-provider { - base config:module-type; - config:java-name-prefix ClusterAdminProvider; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case cluster-admin-provider { - when "/config:modules/config:module/config:type = 'cluster-admin-provider'"; - container config-data-store { - uses config:service-ref { - refine type { - mandatory false; - config:required-identity config-dom-store-spi:config-dom-datastore; - } - } - } - - container oper-data-store { - uses config:service-ref { - refine type { - mandatory false; - config:required-identity operational-dom-store-spi:operational-dom-datastore; - } - } - } - - container rpc-registry { - uses config:service-ref { - refine type { - mandatory false; - config:required-identity mdsal:binding-rpc-registry; - } - } - } - } - } -} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf index 3ee5fe8ac0..30efc61038 100644 --- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf +++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/05-clustering.xml.conf @@ -6,6 +6,10 @@ 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 + + NOTE: This file is deprecated as wiring is now done via blueprint. This file is kept + for backward compatibility and runtime modifications will not be honored. In + addition, this file is overwritten on feature re-install. --> @@ -68,26 +72,6 @@ 20 - - - prefix:cluster-admin-provider - cluster-admin-provider - - - operational-dom-store-spi:operational-dom-datastore - distributed-operational-store-service - - - - config-dom-store-spi:config-dom-datastore - distributed-config-store-service - - - - binding:binding-rpc-registry - binding-rpc-broker - - @@ -130,8 +114,6 @@ urn:opendaylight:params:xml:ns:yang:controller:config:concurrent-data-broker?module=odl-concurrent-data-broker-cfg&revision=2014-11-24 urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:service?module=actor-system-provider-service&revision=2015-10-05 urn:opendaylight:params:xml:ns:yang:controller:config:actor-system-provider:impl?module=actor-system-provider-impl&revision=2015-10-05 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:cluster:admin?module=cluster-admin&revision=2015-10-13 - urn:opendaylight:params:xml:ns:yang:controller:config:cluster-admin-provider?module=cluster-admin-provider&revision=2015-10-13 urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider?module=distributed-datastore-provider&revision=2014-06-12 urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store?module=opendaylight-config-dom-datastore&revision=2014-06-17 urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store?module=opendaylight-operational-dom-datastore&revision=2014-06-17