Remove config subsystem remnants 25/61525/2
authorTom Pantelis <tompantelis@gmail.com>
Fri, 11 Aug 2017 01:32:41 +0000 (21:32 -0400)
committerTom Pantelis <tompantelis@gmail.com>
Tue, 15 Aug 2017 13:47:25 +0000 (09:47 -0400)
The project no longer uses the CSS so remove unused/unneeded
remnants.

Change-Id: I530c4e0716a428f20674c3f76a833b0822a8ac41
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
12 files changed:
.gitignore
manager/common/pom.xml
manager/common/yang/pom.xml
manager/features/odl-vtn-manager/pom.xml
manager/features/odl-vtn-manager/src/main/feature/feature.xml
manager/implementation/pom.xml
manager/implementation/src/main/config/default-config.xml [deleted file]
manager/implementation/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/vtn/impl/provider/rev150209/VTNProviderModule.java [deleted file]
manager/implementation/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/vtn/impl/provider/rev150209/VTNProviderModuleFactory.java [deleted file]
manager/implementation/src/main/yang/vtn-provider.yang [deleted file]
manager/it/ofmock/pom.xml
manager/neutron/pom.xml

index c655842242101f43cf54800b28f351d149e9f5d9..6fcbdcd0ae6464d71260809aa62ffc7f8cd51bfa 100644 (file)
@@ -1,5 +1,6 @@
 *~
 target
+target-ide
 **/target
 /coordinator/build/config.mk
 /coordinator/core/build/config.mk
index 13e084b30cc38f4e7a45b701b7fee32bb214c16f..f234236da4f521b101f855d35594cae90744b491 100644 (file)
@@ -71,7 +71,6 @@
 
     <!-- OpenDaylight artifacts -->
     <odl.controller.mdsal.version>1.7.0-SNAPSHOT</odl.controller.mdsal.version>
-    <odl.config.version>0.8.0-SNAPSHOT</odl.config.version>
     <odl.yangtools.version>2.0.0-SNAPSHOT</odl.yangtools.version>
     <odl.mdsal.version>2.4.0-SNAPSHOT</odl.mdsal.version>
     <odl.mdsal.model.version>0.12.0-SNAPSHOT</odl.mdsal.model.version>
         <version>${odl.controller.mdsal.version}</version>
       </dependency>
 
-      <!-- OpenDaylight config subsystem -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>${odl.config.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
       <!-- OpenDaylight YANG Tools -->
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
index c0b409b86b56467743637b7f0e818b87b88c28fe..54d3f42adbc4c168ea94b34b643cfc9f129bd861 100644 (file)
@@ -39,7 +39,6 @@
       ${project.build.directory}/generated-sources
     </vtn.build.generated-sources>
     <salGeneratorPath>${vtn.build.generated-sources}/sal</salGeneratorPath>
-    <jmxGeneratorPath>${vtn.build.generated-sources}/config</jmxGeneratorPath>
     <docGeneratorPath>${project.build.directory}/site/models</docGeneratorPath>
   </properties>
 
               <phase>generate-sources</phase>
               <configuration>
                 <sources>
-                  <source>${jmxGeneratorPath}</source>
                   <source>${salGeneratorPath}</source>
                 </sources>
               </configuration>
               </goals>
               <configuration>
                 <codeGenerators>
-                  <generator>
-                    <codeGeneratorClass>
-                      org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                    </codeGeneratorClass>
-                    <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-                    <additionalConfiguration>
-                      <namespaceToPackage1>
-                        urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-                      </namespaceToPackage1>
-                    </additionalConfiguration>
-                  </generator>
                   <generator>
                     <codeGeneratorClass>
                       org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
             </execution>
           </executions>
           <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>yang-jmx-generator-plugin</artifactId>
-              <version>${odl.config.version}</version>
-            </dependency>
             <dependency>
               <groupId>org.opendaylight.mdsal</groupId>
               <artifactId>maven-sal-api-gen-plugin</artifactId>
index c7bfe4ff8e44a94a8aa161275e279fff619dfe99..8fc57024edd1a7db76dc5ae3c8f73cd9276d1ba8 100644 (file)
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.vtn</groupId>
-      <artifactId>manager.implementation</artifactId>
-      <version>${project.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>manager.model</artifactId>
index 46ffc14507e8e0d74265aaedf45d6bcffd959dfb..56a1841368e9a70e312bfd91f659b16926ec9d57 100644 (file)
@@ -16,6 +16,5 @@
    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
   <feature name="odl-vtn-manager" version="${project.version}">
-    <configfile finalname="etc/opendaylight/karaf/80-vtn.xml">mvn:org.opendaylight.vtn/manager.implementation/${project.version}/xml/config</configfile>
   </feature>
 </features>
index ff89e5f698d62e667a6905ec8dc91af4e5a9f8a8..5eab3fe0960e19020ad6b34b24003e1d683d02e6 100644 (file)
     <!-- OpenDaylight controller (MD-SAL) -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
+      <artifactId>sal-binding-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
diff --git a/manager/implementation/src/main/config/default-config.xml b/manager/implementation/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 4f04a85..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-#
-# Copyright (c) 2015-2016 NEC Corporation
-# 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
-#
--->
-
-<!-- Configuration for VTN Manager provider module. -->
-<snapshot>
-  <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:vtn="urn:opendaylight:vtn:impl:provider">
-            vtn:vtn-provider
-          </type>
-          <name>vtn-provider</name>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-
-  <required-capabilities>
-    <!-- Required YANG models: openflowplugin -->
-    <capability>
-      urn:opendaylight:flow:service?module=sal-flow&amp;revision=2013-08-19
-    </capability>
-    <capability>
-      urn:opendaylight:direct:statistics?module=opendaylight-direct-statistics&amp;revision=2016-05-11
-    </capability>
-    <capability>
-      urn:opendaylight:packet:service?module=packet-processing&amp;revision=2013-07-09
-    </capability>
-
-    <!-- Required YANG models: VTN -->
-    <capability>
-      urn:opendaylight:vtn?module=vtn&amp;revision=2015-03-28
-    </capability>
-    <capability>
-      urn:opendaylight:vtn:config?module=vtn-config&amp;revision=2015-02-09
-    </capability>
-    <capability>
-      urn:opendaylight:vtn:pathmap?module=vtn-path-map&amp;revision=2015-03-28
-    </capability>
-    <capability>
-      urn:opendaylight:vtn:pathpolicy?module=vtn-path-policy&amp;revision=2015-02-09
-    </capability>
-    <capability>
-      urn:opendaylight:vtn:topology:static?module=vtn-static-topology&amp;revision=2015-08-01
-    </capability>
-    <capability>
-      urn:opendaylight:vtn:version?module=vtn-version&amp;revision=2015-09-01
-    </capability>
-    <capability>
-      urn:opendaylight:vtn:impl:flow?module=vtn-flow-impl&amp;revision=2015-03-13
-    </capability>
-    <capability>
-      urn:opendaylight:vtn:impl:inventory?module=vtn-inventory&amp;revision=2015-02-09
-    </capability>
-    <capability>
-      urn:opendaylight:vtn:impl:topology?module=vtn-topology&amp;revision=2015-02-09
-    </capability>
-    <capability>
-      urn:opendaylight:vtn:impl:mapping?module=vtn-mapping&amp;revision=2015-10-01
-    </capability>
-
-    <!-- VTN Manager -->
-    <capability>
-      urn:opendaylight:vtn:impl:provider?module=vtn-provider&amp;revision=2015-02-09
-    </capability>
-  </required-capabilities>
-</snapshot>
diff --git a/manager/implementation/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/vtn/impl/provider/rev150209/VTNProviderModule.java b/manager/implementation/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/vtn/impl/provider/rev150209/VTNProviderModule.java
deleted file mode 100644 (file)
index deda879..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2015, 2016 NEC Corporation. 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.yang.gen.v1.urn.opendaylight.vtn.impl.provider.rev150209;
-
-import static org.opendaylight.controller.config.api.osgi.WaitingServiceTracker.FIVE_MINUTES;
-
-import org.osgi.framework.BundleContext;
-
-import org.opendaylight.vtn.manager.VTNManager;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.opendaylight.controller.config.api.ModuleIdentifier;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
-
-/**
- * Config subsystem module for the VTN Manager service.
- */
-public final class VTNProviderModule extends AbstractVTNProviderModule {
-    /**
-     * OSGi bundle context.
-     */
-    private BundleContext  bundleContext;
-
-    /**
-     * Construct a VTN Manager provider module.
-     *
-     * @param identifier
-     *    Module identifier for the VTN Manager provider.
-     * @param dependencyResolver
-     *    Dependency resolver.
-     */
-    public VTNProviderModule(ModuleIdentifier identifier,
-                             DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    /**
-     * Construct a VTN Manager provider module.
-     *
-     * @param identifier
-     *    Module identifier for the VTN Manager provider.
-     * @param dependencyResolver
-     *    Dependency resolver.
-     * @param oldModule
-     *    Old {@link VTNProviderModule} instance.
-     * @param oldInstance
-     *    Old provider instance.
-     */
-    public VTNProviderModule(ModuleIdentifier identifier,
-                             DependencyResolver dependencyResolver,
-                             VTNProviderModule oldModule,
-                             AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    /**
-     * Set the bundle context for the OSGi bundle that contains this class.
-     *
-     * @param bc  The OSGi bundle context.
-     */
-    void setBundleContext(BundleContext bc) {
-        bundleContext = bc;
-    }
-
-    /**
-     * Instantiate VTN Manager service.
-     *
-     * <p>
-     *   VTN Manager instance is created via OSGi blueprint.
-     *   This method only waits for VTN Manager instance to be created.
-     * </p>
-     *
-     * @return  An {@link AutoCloseable} instance.
-     */
-    @Override
-    public AutoCloseable createInstance() {
-        try (WaitingServiceTracker<VTNManager> tracker =
-             WaitingServiceTracker.create(VTNManager.class, bundleContext)) {
-            tracker.waitForService(FIVE_MINUTES);
-        }
-
-        return NoopAutoCloseable.INSTANCE;
-    }
-}
diff --git a/manager/implementation/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/vtn/impl/provider/rev150209/VTNProviderModuleFactory.java b/manager/implementation/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/vtn/impl/provider/rev150209/VTNProviderModuleFactory.java
deleted file mode 100644 (file)
index bd1602d..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2015, 2016 NEC Corporation. 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.yang.gen.v1.urn.opendaylight.vtn.impl.provider.rev150209;
-
-import org.osgi.framework.BundleContext;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-
-/**
- * Factory class for VTN Manager provider module.
- */
-public class VTNProviderModuleFactory extends AbstractVTNProviderModuleFactory {
-    /**
-     * Instantiate the VTN Manager provider module.
-     *
-     * @param instanceName        The name of the instance.
-     * @param dependencyResolver  Dependency resolver.
-     * @param oldModule           Old {@link VTNProviderModule} instance.
-     * @param oldInstance         Old provider instance.
-     * @param bundleContext       OSGi bundle context.
-     * @return  VTN Manager provider module instance.
-     */
-    @Override
-    public VTNProviderModule instantiateModule(
-        String instanceName, DependencyResolver dependencyResolver,
-        VTNProviderModule oldModule, AutoCloseable oldInstance,
-        BundleContext bundleContext) {
-        VTNProviderModule module = super.instantiateModule(
-            instanceName, dependencyResolver, oldModule, oldInstance,
-            bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    /**
-     * Instantiate the VTN Manager provider module.
-     *
-     * @param instanceName        The name of the instance.
-     * @param dependencyResolver  Dependency resolver.
-     * @param bundleContext       OSGi bundle context.
-     * @return  VTN Manager provider module instance.
-     */
-    @Override
-    public VTNProviderModule instantiateModule(
-        String instanceName, DependencyResolver dependencyResolver,
-        BundleContext bundleContext) {
-        VTNProviderModule module = super.instantiateModule(
-            instanceName, dependencyResolver, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}
diff --git a/manager/implementation/src/main/yang/vtn-provider.yang b/manager/implementation/src/main/yang/vtn-provider.yang
deleted file mode 100644 (file)
index 942af57..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2015, 2016 NEC Corporation. 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
- */
-
-module vtn-provider {
-    yang-version 1;
-    namespace "urn:opendaylight:vtn:impl:provider";
-    prefix vtn-provider;
-
-    /* OpenDaylight controller */
-    import config {
-        prefix config;
-        revision-date 2013-04-05;
-    }
-
-    description
-      "This module contains the base YANG definition for the VTN Manager
-       provider implementation.";
-
-    revision 2015-02-09 {
-        description "Initial revision.";
-    }
-
-    identity vtn-provider {
-        base config:module-type;
-
-        // Specifies the prefix for generated Java classes.
-        config:java-name-prefix VTNProvider;
-    }
-
-    // Augments the 'configuration' choice node under modules/module.
-    augment "/config:modules/config:module/config:configuration" {
-        case vtn-provider {
-            when "/config:modules/config:module/config:type = 'vtn-provider'";
-        }
-    }
-}
index 9f56ae830aa42f0431955333859ad345be207c0b..24d22def681b02c066d0a1cd208d4ab6dba7b924 100644 (file)
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-topology</artifactId>
     </dependency>
 
-    <!-- OpenDaylight config subsystem -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-
     <!-- OpenDaylight YANG Tools -->
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
index d8479f95fdbeef3425e870c5f86d7883d32ab58f..257266e6e03fd2e387595f13cfd56772cfb4ce97 100644 (file)
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-api</artifactId>