BUG-7027 : Remove Data change counter CSS configuration 10/56010/10
authorDana Kutenicsova <dana.kutenics@gmail.com>
Tue, 25 Apr 2017 15:21:17 +0000 (17:21 +0200)
committerClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Mon, 3 Jul 2017 20:32:08 +0000 (20:32 +0000)
since is not longer need it. New configuration is done via REST.

Change-Id: I32c3ffcfa66108d72dd8033e44b1cbd7596537eb
Signed-off-by: Dana Kutenicsova <dana.kutenics@gmail.com>
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
artifacts/pom.xml
data-change-counter-controller-config/pom.xml [deleted file]
data-change-counter-controller-config/src/main/resources/initial/50-topology-data-change-counter.xml [deleted file]
data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModule.java [deleted file]
data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModuleFactory.java [deleted file]
data-change-counter/src/main/yang/odl-data-change-counter-cfg.yang [deleted file]
features/bgpcep-extras/features-bgpcep-extras/pom.xml
features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml [deleted file]
features/bgpcep-extras/odl-bgpcep-data-change-counter/src/main/feature/feature.xml [deleted file]
features/bgpcep-extras/pom.xml
pom.xml

index cc5b3fb473c22de4467a230a1c4c8ce9b8339ed7..db541797f500340ea34eb36d9544e6bd3ff211a1 100644 (file)
                 <artifactId>data-change-counter</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>data-change-counter-controller-config</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
-            </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
diff --git a/data-change-counter-controller-config/pom.xml b/data-change-counter-controller-config/pom.xml
deleted file mode 100644 (file)
index f05797e..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!-- Copyright (c) 2014 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 -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>bgpcep-parent</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
-  </parent>
-  <artifactId>data-change-counter-controller-config</artifactId>
-  <description>Controller Configuration files for data-change-counter module.</description>
-  <packaging>jar</packaging>
-  <name>${project.artifactId}</name>
-
-  <build>
-    <plugins>
-      <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <executions>
-              <execution>
-                  <id>attach-artifacts</id>
-                  <goals>
-                      <goal>attach-artifact</goal>
-                  </goals>
-                  <phase>package</phase>
-                  <configuration>
-                      <artifacts>
-                          <artifact>
-                              <file>${project.build.directory}/classes/initial/50-topology-data-change-counter.xml</file>
-                              <type>xml</type>
-                              <classifier>config</classifier>
-                          </artifact>
-                      </artifacts>
-                  </configuration>
-              </execution>
-          </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/${project.artifactId}/</url>
-    </site>
-  </distributionManagement>
-</project>
-
diff --git a/data-change-counter-controller-config/src/main/resources/initial/50-topology-data-change-counter.xml b/data-change-counter-controller-config/src/main/resources/initial/50-topology-data-change-counter.xml
deleted file mode 100644 (file)
index 896b66b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-      Copyright (c) 2014 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
--->
-<snapshot>
-    <required-capabilities>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:bgpcep:data:change:counter?module=odl-data-change-counter-cfg&amp;revision=2016-03-15</capability>
-    </required-capabilities>
-    <configuration>
-
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgpcep:data:change:counter">prefix:data-change-counter-impl</type>
-                    <name>data-change-counter</name>
-                    <counter-id>data-change-counter</counter-id>
-                    <data-provider>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                        <name>binding-data-broker</name>
-                    </data-provider>
-                    <topology-name>example-linkstate-topology</topology-name>
-                </module>
-            </modules>
-            <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-            </services>
-        </data>
-
-    </configuration>
-</snapshot>
diff --git a/data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModule.java b/data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModule.java
deleted file mode 100755 (executable)
index 7578ae0..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2014 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.bgpcep.data.change.counter;
-
-import org.opendaylight.controller.config.api.JmxAttributeValidationException;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.protocol.data.change.counter.TopologyDataChangeCounterDeployer;
-import org.osgi.framework.BundleContext;
-
-/**
- * @deprecated Replaced by blueprint wiring but remains for backwards compatibility until downstream users
- *             of the provided config system service are converted to blueprint.
- */
-public class DataChangeCounterImplModule extends org.opendaylight.controller.config.yang.bgpcep.data.change.counter.AbstractDataChangeCounterImplModule {
-
-    private BundleContext bundleContext;
-
-    public DataChangeCounterImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public DataChangeCounterImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            final org.opendaylight.controller.config.yang.bgpcep.data.change.counter.DataChangeCounterImplModule oldModule,
-            final java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        JmxAttributeValidationException.checkNotNull(getCounterId(), "value is not set.", counterIdJmxAttribute);
-        JmxAttributeValidationException.checkNotNull(getTopologyName(), "value is not set.", topologyNameJmxAttribute);
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        final WaitingServiceTracker<TopologyDataChangeCounterDeployer> deployerTracker =
-            WaitingServiceTracker.create(TopologyDataChangeCounterDeployer.class, this.bundleContext);
-        final TopologyDataChangeCounterDeployer deployer = deployerTracker
-            .waitForService(WaitingServiceTracker.FIVE_MINUTES);
-        final String counterId = getCounterId();
-        deployer.chandleCounterChange(counterId, getTopologyName());
-        return ()->{
-            deployer.deleteCounterChange(counterId);
-            deployerTracker.close();
-        };
-    }
-
-    public void setBundleContext(final BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-}
diff --git a/data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModuleFactory.java b/data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModuleFactory.java
deleted file mode 100755 (executable)
index 03262a7..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2014 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
- */
-
-/*
-* Generated file
-*
-* Generated from: yang module name: odl-data-change-counter-cfg yang module local name: data-change-counter-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Aug 20 13:09:16 CEST 2014
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-/**
- * @deprecated Replaced by blueprint wiring but remains for backwards compatibility until downstream users
- *             of the provided config system service are converted to blueprint.
- */
-package org.opendaylight.controller.config.yang.bgpcep.data.change.counter;
-
-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;
-
-public class DataChangeCounterImplModuleFactory extends org.opendaylight.controller.config.yang.bgpcep.data.change.counter.AbstractDataChangeCounterImplModuleFactory {
-    @Override
-    public Module createModule(final String instanceName, final DependencyResolver dependencyResolver, final BundleContext bundleContext) {
-        final DataChangeCounterImplModule module = (DataChangeCounterImplModule) super.createModule(instanceName, dependencyResolver, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public Module createModule(final String instanceName, final DependencyResolver dependencyResolver,
-                               final DynamicMBeanWithInstance old, final BundleContext bundleContext) throws Exception {
-        final DataChangeCounterImplModule module = (DataChangeCounterImplModule)  super.createModule(instanceName, dependencyResolver, old, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}
diff --git a/data-change-counter/src/main/yang/odl-data-change-counter-cfg.yang b/data-change-counter/src/main/yang/odl-data-change-counter-cfg.yang
deleted file mode 100644 (file)
index a1a66c0..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-// vi: set smarttab et sw=4 tabstop=4:
-module odl-data-change-counter-cfg {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:bgpcep:data:change:counter";
-    prefix "dcc-cfg";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
-
-    organization "Cisco Systems, Inc.";
-
-    contact "Milos Fabian <milfabia@cisco.com>";
-
-    description
-        "This module contains the base YANG definitions for
-         topology data-change counter.
-
-        Copyright (c)2014 Cisco Systems, Inc. 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";
-
-    revision "2016-03-15" {
-        description
-            "Updated to support multiple instances";
-    }
-    revision "2014-08-15" {
-        description
-            "Initial revision";
-    }
-
-    identity data-change-counter-impl {
-        base config:module-type;
-        config:java-name-prefix DataChangeCounterImpl;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case data-change-counter-impl {
-            when "/config:modules/config:module/config:type = 'data-change-counter-impl'";
-
-            leaf counter-id {
-                type string;
-            }
-
-            leaf topology-name {
-                type string;
-            }
-
-            container data-provider {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-async-data-broker;
-                    }
-                }
-            }
-        }
-    }
-}
index 20b0baa2d1e49bd615ce54561bf20a83d9e520d1..fdfb35e933b1cfc5dc89ad79dca7ee7c47eb0e18 100644 (file)
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-data-change-counter</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
     </dependencies>
 
     <!--
diff --git a/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml b/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml
deleted file mode 100644 (file)
index 7e303ee..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.0.1</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>odl-bgpcep-data-change-counter</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>OpenDaylight :: Extras :: Data Change Counter</name>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- ODL-BGP-ARTIFACTS -->
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>bgpcep-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>dependency-version-management</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>data-change-counter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-extras-dependencies</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-core</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>data-change-counter-controller-config</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features/bgpcep-extras/odl-bgpcep-data-change-counter/src/main/feature/feature.xml b/features/bgpcep-extras/odl-bgpcep-data-change-counter/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 09bc799..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014, 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
--->
-<features name="odl-bgpcep-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <feature name="odl-bgpcep-data-change-counter-config" version="${project.version}">
-        <configfile finalname="etc/opendaylight/karaf/50-topology-data-change-counter.xml">
-            mvn:org.opendaylight.bgpcep/data-change-counter-controller-config/${project.version}/xml/config
-        </configfile>
-    </feature>
-</features>
index 0af60276301cad5fa423a45396280ae54a7fe6d9..9f2affd740ddb52f6ad897fe7ec5af1bdaf59a24 100644 (file)
@@ -25,7 +25,6 @@
     <modules>
         <module>features-bgpcep-extras</module>
         <module>odl-bgpcep-extras-dependencies</module>
-        <module>odl-bgpcep-data-change-counter</module>
     </modules>
 
   <!--
diff --git a/pom.xml b/pom.xml
index 45fd1e94f9ac19cbb713066d969794601d26c539..b07cb930203df47bb6d1058ea1050664ec79e169 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,6 @@
         <!--Test tools -->
         <module>data-change-counter</module>
         <module>testtool-util</module>
-        <module>data-change-counter-controller-config</module>
 
         <!-- Minimal complete distribution -->
         <module>distribution-karaf</module>