Remove RSVP extension SPI config yang 13/40513/6
authorTom Pantelis <tpanteli@brocade.com>
Sat, 18 Jun 2016 14:36:25 +0000 (10:36 -0400)
committerTom Pantelis <tpanteli@brocade.com>
Thu, 14 Jul 2016 07:06:41 +0000 (03:06 -0400)
All RSVP extension providers and consumers have been converted to
blueprint so the config yang, Module classes and 27-rvsp.xml were
removed.

Change-Id: I945643bda306d1c8894d0e6788467c2f774489a5
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
bgp/controller-config/src/main/resources/initial/31-bgp.xml
features/rsvp/pom.xml
features/rsvp/src/main/features/features.xml
rsvp/controller-config/pom.xml [deleted file]
rsvp/controller-config/src/main/resources/initial/27-rsvp.xml [deleted file]
rsvp/pom.xml
rsvp/spi/src/main/java/org/opendaylight/controller/config/yang/rsvp/spi/SimpleRSVPExtensionProviderContextModule.java [deleted file]
rsvp/spi/src/main/java/org/opendaylight/controller/config/yang/rsvp/spi/SimpleRSVPExtensionProviderContextModuleFactory.java [deleted file]
rsvp/spi/src/main/yang/odl-rsvp-parser-spi-cfg.yang [deleted file]

index d5788d7ea4d8ef6cb202956546b61061126adb51..5a8b6f97b4e08c39d7e7b5030edfa9e811abfeb9 100644 (file)
@@ -13,7 +13,6 @@
         <capability>urn:opendaylight:params:xml:ns:yang:bgp-types?module=bgp-types&amp;revision=2013-09-19</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=odl-bgp-rib-spi-cfg&amp;revision=2013-11-15</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl?module=odl-bgp-rib-impl-cfg&amp;revision=2016-03-30</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:rsvp:spi?module=odl-rsvp-parser-spi-cfg&amp;revision=2015-08-26</capability>
     </required-capabilities>
     <configuration>
 
index 420cf98990ad7454da2760529d39617edb078356..8768317142afb71a75e236608ce760cfaefb047a 100644 (file)
             <groupId>${project.groupId}</groupId>
             <artifactId>rsvp-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>rsvp-controller-config</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-concepts</artifactId>
index 1ca038a8fbaa050bfc27ccde22c3512a0e6d7403..b6e32ccd0751b5b33bf869b82151fa6b721f9fea 100644 (file)
@@ -19,7 +19,6 @@
         <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/rsvp-spi/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/rsvp-impl/{{VERSION}}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/27-rsvp.xml">mvn:org.opendaylight.bgpcep/rsvp-controller-config/{{VERSION}}/xml/config</configfile>
     </feature>
 
     <feature name='odl-bgpcep-rsvp-dependencies' version='${project.version}'>
diff --git a/rsvp/controller-config/pom.xml b/rsvp/controller-config/pom.xml
deleted file mode 100644 (file)
index bd2287a..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-      Copyright (c) 2015 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>
-
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/bgpcep.git</developerConnection>
-        <url>https://wiki.opendaylight.org/view/BGP_LS_PCEP:Main</url>
-        <tag>HEAD</tag>
-    </scm>
-    <parent>
-        <artifactId>rsvp-parent</artifactId>
-        <groupId>org.opendaylight.bgpcep</groupId>
-        <version>0.6.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>rsvp-controller-config</artifactId>
-    <description>Controller Configuration files for RSVP protocol</description>
-    <packaging>jar</packaging>
-    <name>${project.artifactId}</name>
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>programming-controller-config</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <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/27-rsvp.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>
\ No newline at end of file
diff --git a/rsvp/controller-config/src/main/resources/initial/27-rsvp.xml b/rsvp/controller-config/src/main/resources/initial/27-rsvp.xml
deleted file mode 100644 (file)
index 51b80f3..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-    Copyright (c) 2013 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:rsvp:spi?module=odl-rsvp-parser-spi-cfg&amp;revision=2015-08-26</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:rsvp:spi">prefix:rsvp-extensions-impl</type>
-                    <name>global-rsvp-extensions</name>
-                </module>
-            </modules>
-            <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <service>
-                    <type xmlns:rsvp-spi="urn:opendaylight:params:xml:ns:yang:controller:rsvp:spi">rsvp-spi:rsvp-extensions</type>
-                    <instance>
-                        <name>global-rsvp-extensions</name>
-                        <provider>/modules/module[type='rsvp-extensions-impl'][name='global-rsvp-extensions']</provider>
-                    </instance>
-                </service>
-            </services>
-        </data>
-    </configuration>
-</snapshot>
\ No newline at end of file
index ab8f267c871a00e64bc91751fcea2397d83f566a..b98eb699d1e45d4a1cb9e4e8b01e0750673b3f4f 100644 (file)
@@ -34,7 +34,6 @@
         <module>api</module>
         <module>spi</module>
         <module>impl</module>
-        <module>controller-config</module>
     </modules>
 
   <!--
diff --git a/rsvp/spi/src/main/java/org/opendaylight/controller/config/yang/rsvp/spi/SimpleRSVPExtensionProviderContextModule.java b/rsvp/spi/src/main/java/org/opendaylight/controller/config/yang/rsvp/spi/SimpleRSVPExtensionProviderContextModule.java
deleted file mode 100644 (file)
index e91b445..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2015 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.rsvp.spi;
-
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.google.common.reflect.Reflection;
-import java.lang.reflect.Method;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.protocol.rsvp.parser.spi.RSVPExtensionProviderContext;
-import org.osgi.framework.BundleContext;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class SimpleRSVPExtensionProviderContextModule extends org.opendaylight.controller.config.yang.rsvp.spi.AbstractSimpleRSVPExtensionProviderContextModule {
-    private BundleContext bundleContext;
-
-    public SimpleRSVPExtensionProviderContextModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public SimpleRSVPExtensionProviderContextModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.rsvp.spi.SimpleRSVPExtensionProviderContextModule 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() {
-        final WaitingServiceTracker<RSVPExtensionProviderContext> tracker =
-                WaitingServiceTracker.create(RSVPExtensionProviderContext.class, bundleContext);
-        final RSVPExtensionProviderContext service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        return Reflection.newProxy(AutoCloseableRSVPExtensionProviderContext.class, new AbstractInvocationHandler() {
-            @Override
-            protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
-                if (method.getName().equals("close")) {
-                    tracker.close();
-                    return null;
-                } else {
-                    return method.invoke(service, args);
-                }
-            }
-        });
-    }
-
-    void setBundleContext(BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-
-    private static interface AutoCloseableRSVPExtensionProviderContext extends RSVPExtensionProviderContext, AutoCloseable {
-    }
-}
diff --git a/rsvp/spi/src/main/java/org/opendaylight/controller/config/yang/rsvp/spi/SimpleRSVPExtensionProviderContextModuleFactory.java b/rsvp/spi/src/main/java/org/opendaylight/controller/config/yang/rsvp/spi/SimpleRSVPExtensionProviderContextModuleFactory.java
deleted file mode 100644 (file)
index ada0d79..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2015 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.rsvp.spi;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.osgi.framework.BundleContext;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class SimpleRSVPExtensionProviderContextModuleFactory extends AbstractSimpleRSVPExtensionProviderContextModuleFactory {
-    @Override
-    public SimpleRSVPExtensionProviderContextModule instantiateModule(String instanceName, DependencyResolver dependencyResolver,
-            SimpleRSVPExtensionProviderContextModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) {
-        SimpleRSVPExtensionProviderContextModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule,
-                oldInstance, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public SimpleRSVPExtensionProviderContextModule instantiateModule(String instanceName, DependencyResolver dependencyResolver,
-            BundleContext bundleContext) {
-        SimpleRSVPExtensionProviderContextModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}
diff --git a/rsvp/spi/src/main/yang/odl-rsvp-parser-spi-cfg.yang b/rsvp/spi/src/main/yang/odl-rsvp-parser-spi-cfg.yang
deleted file mode 100644 (file)
index c7c30c7..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-// vi: set smarttab et sw=4 tabstop=4:
-module odl-rsvp-parser-spi-cfg {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:rsvp:spi";
-    prefix "rsvp-spi";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    organization "Cisco Systems, Inc.";
-
-    contact "Claudio D. Gasparini <cgaspari@cisco.com>";
-
-    description
-        "This module contains the base YANG definitions for
-         RSPV listener implementation.
-
-        Copyright (c)2015 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 "2015-08-26" {
-        description
-            "Initial revision";
-    }
-
-    identity consumer-extensions {
-        description
-            "Service representing a RSVP parser extension registry. Extension
-            consumers have this service injected.";
-
-        base "config:service-type";
-        config:java-class "org.opendaylight.protocol.rsvp.parser.spi.RSVPExtensionConsumerContext";
-    }
-
-    identity rsvp-extensions {
-        description
-            "Service representing a RSVP parser extension registry. Extension
-            providers have this service injected for registration.";
-
-        base "consumer-extensions";
-        config:java-class "org.opendaylight.protocol.rsvp.parser.spi.RSVPExtensionProviderContext";
-    }
-
-    identity rsvp-extensions-impl {
-        base config:module-type;
-        config:provided-service rsvp-extensions;
-        config:java-name-prefix SimpleRSVPExtensionProviderContext;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case rsvp-extensions-impl {
-            when "/config:modules/config:module/config:type = 'rsvp-extensions-impl'";
-        }
-    }
-}
\ No newline at end of file