Removing mappingservice.netconf and its dependencies from build

Change-Id: I2e16ff038fbe5e3fbfc25c41968384a20cdb329d
Signed-off-by: Florin Coras <fcoras@cisco.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index bdc3f0046180e5be2aead9842a52ed75f248fa75..770f3e29a95e305f11caaf775e53512557a999f8 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -42,11 +42,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>mappingservice.inmemorydb</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
+<!--       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>mappingservice.netconf</artifactId>
         <version>${project.version}</version>
-      </dependency>
+      </dependency> -->
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>mappingservice.neutron</artifactId>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index e19274f71487878c8267b7dc7d258ec0ced34584..797a7dd7b2c230ff6f2c93c2066c915e69cf11e9 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -111,13 +111,13 @@
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>
-      <dependency>
+<!--       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>features-netconf-connector</artifactId>
         <version>${mdsal.version}</version>
         <classifier>features</classifier>
         <type>xml</type>
-      </dependency>
+      </dependency> -->
       <dependency>
         <groupId>org.opendaylight.neutron</groupId>
         <artifactId>features-neutron</artifactId>
@@ -231,11 +231,11 @@
         <artifactId>mappingservice.inmemorydb</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
-      <dependency>
+<!--       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
         <artifactId>mappingservice.netconf</artifactId>
         <version>${lispflowmapping.version}</version>
-      </dependency>
+      </dependency> -->
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
         <artifactId>mappingservice.neutron</artifactId>

diff --git a/features/pom.xml b/features/pom.xml
index b400f1599dae63c0e11e49fa31f8cd21cb3403b0..0fa870b967ae011d1eb613d437da0df8506a08de 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -46,12 +46,12 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
+<!--     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-netconf-connector</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
-    </dependency>
+    </dependency> -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-nsf</artifactId>
@@ -127,10 +127,10 @@
       <classifier>config</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
+<!--     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.netconf</artifactId>
-    </dependency>
+    </dependency> -->
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.neutron</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index b82417d2a6851c910b7daa0299b814970acec9d4..a732f9a7801bf7848795232438094bfb41908cb2 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -18,13 +18,13 @@
     <repository>mvn:org.opendaylight.controller/features-base/${commons.opendaylight.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-nsf/${nsf.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-netconf-connector/${mdsal.version}/xml/features</repository>
+    <!-- <repository>mvn:org.opendaylight.controller/features-netconf-connector/${mdsal.version}/xml/features</repository> -->
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
 
     <feature name="odl-lispflowmapping-all" description="OpenDaylight :: LISP Flow Mapping :: All" version='${lispflowmapping.version}'>
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-southbound</feature>
-        <feature version="${lispflowmapping.version}">odl-lispflowmapping-netconf</feature>
+        <!-- <feature version="${lispflowmapping.version}">odl-lispflowmapping-netconf</feature> -->
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-neutron</feature>
     </feature>
 
@@ -70,11 +70,11 @@
         </configfile>
     </feature>
 
-    <feature name="odl-lispflowmapping-netconf" description="OpenDaylight :: LISP Flow Mapping :: NETCONF" version='${lispflowmapping.version}'>
+<!--     <feature name="odl-lispflowmapping-netconf" description="OpenDaylight :: LISP Flow Mapping :: NETCONF" version='${lispflowmapping.version}'>
         <feature version="${mdsal.version}">odl-netconf-connector-ssh</feature>
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.netconf/${lispflowmapping.version}</bundle>
-    </feature>
+    </feature> -->
 
     <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${lispflowmapping.version}'>
         <feature version="${neutron.version}">odl-neutron-service</feature>

diff --git a/mappingservice/netconf/pom.xml b/mappingservice/netconf/pom.xml
index 8067237da943d33ba41b73fff9982c6fac01b2c4..3d506a27415b991fd706bb2a16b7be52ffc0ca33 100644 (file)
--- a/mappingservice/netconf/pom.xml
+++ b/mappingservice/netconf/pom.xml
@@ -108,7 +108,7 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
+<!--       <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-maven-plugin</artifactId>
         <executions>
@@ -136,7 +136,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
+      </plugin> -->
     </plugins>
   </build>
 </project>

diff --git a/mappingservice/netconf/src/main/java/org/opendaylight/lispflowmapping/config/yang/netconf/impl/LfmNetconfConnectorProviderModule.java b/mappingservice/netconf/src/main/java/org/opendaylight/controller/config/yang/config/lfm_netconf/impl/LfmNetconfConnectorProviderModule.java
similarity index 77%
rename from mappingservice/netconf/src/main/java/org/opendaylight/lispflowmapping/config/yang/netconf/impl/LfmNetconfConnectorProviderModule.java
rename to mappingservice/netconf/src/main/java/org/opendaylight/controller/config/yang/config/lfm_netconf/impl/LfmNetconfConnectorProviderModule.java
index 77a40058f832b79b57fe06c4c7ee2fcb6904ea25..e9999ea491d7052391d74f836fff8810288f037c 100644 (file)
--- a/mappingservice/netconf/src/main/java/org/opendaylight/lispflowmapping/config/yang/netconf/impl/LfmNetconfConnectorProviderModule.java
+++ b/mappingservice/netconf/src/main/java/org/opendaylight/controller/config/yang/config/lfm_netconf/impl/LfmNetconfConnectorProviderModule.java
@@ -1,12 +1,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
- */
-
-package org.opendaylight.lispflowmapping.config.yang.netconf.impl;
+package org.opendaylight.controller.config.yang.config.lfm_netconf.impl;
 
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.lispflowmapping.netconf.impl.LispDeviceNetconfConnector;
@@ -14,14 +6,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lispflow
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class LfmNetconfConnectorProviderModule extends org.opendaylight.lispflowmapping.config.yang.netconf.impl.AbstractLfmNetconfConnectorProviderModule {
+public class LfmNetconfConnectorProviderModule extends org.opendaylight.controller.config.yang.config.lfm_netconf.impl.AbstractLfmNetconfConnectorProviderModule {
     private static final Logger log = LoggerFactory.getLogger(LfmNetconfConnectorProviderModule.class);
 
     public LfmNetconfConnectorProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public LfmNetconfConnectorProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.lispflowmapping.config.yang.netconf.impl.LfmNetconfConnectorProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
+    public LfmNetconfConnectorProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.lfm_netconf.impl.LfmNetconfConnectorProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
@@ -32,7 +24,6 @@ public class LfmNetconfConnectorProviderModule extends org.opendaylight.lispflow
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-
         final LispDeviceNetconfConnector lnconfConnector = LispDeviceNetconfConnector.createLispDeviceNetconfConnector();
 
         final BindingAwareBroker.RpcRegistration<LfmNetconfConnectorService> rpcRegistration = getRpcRegistryDependency()
@@ -53,8 +44,6 @@ public class LfmNetconfConnectorProviderModule extends org.opendaylight.lispflow
         AutoCloseable ret = new AutoCloseableNCC();
         log.info("Lisp netconf connector provider (instance {}) initialized.", ret);
         return ret;
-
     }
 
-
 }

diff --git a/mappingservice/netconf/src/main/java/org/opendaylight/controller/config/yang/config/lfm_netconf/impl/LfmNetconfConnectorProviderModuleFactory.java b/mappingservice/netconf/src/main/java/org/opendaylight/controller/config/yang/config/lfm_netconf/impl/LfmNetconfConnectorProviderModuleFactory.java
new file mode 100644 (file)
index 0000000..cd27808
--- /dev/null
+++ b/mappingservice/netconf/src/main/java/org/opendaylight/controller/config/yang/config/lfm_netconf/impl/LfmNetconfConnectorProviderModuleFactory.java
@@ -0,0 +1,13 @@
+/*
+* Generated file
+*
+* Generated from: yang module name: lfm-ncc-provider-impl yang module local name: lfm-ncc-provider-impl
+* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+* Generated at: Fri Aug 14 11:02:55 CEST 2015
+*
+* Do not modify this file unless it is present under src/main directory
+*/
+package org.opendaylight.controller.config.yang.config.lfm_netconf.impl;
+public class LfmNetconfConnectorProviderModuleFactory extends org.opendaylight.controller.config.yang.config.lfm_netconf.impl.AbstractLfmNetconfConnectorProviderModuleFactory {
+
+}

diff --git a/mappingservice/netconf/src/main/java/org/opendaylight/lispflowmapping/config/yang/netconf/impl/LfmNetconfConnectorProviderModuleFactory.java b/mappingservice/netconf/src/main/java/org/opendaylight/lispflowmapping/config/yang/netconf/impl/LfmNetconfConnectorProviderModuleFactory.java
deleted file mode 100644 (file)
index 903abfd..0000000
--- a/mappingservice/netconf/src/main/java/org/opendaylight/lispflowmapping/config/yang/netconf/impl/LfmNetconfConnectorProviderModuleFactory.java
+++ /dev/null
@@ -1,12 +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.lispflowmapping.config.yang.netconf.impl;
-public class LfmNetconfConnectorProviderModuleFactory extends org.opendaylight.lispflowmapping.config.yang.netconf.impl.AbstractLfmNetconfConnectorProviderModuleFactory {
-
-}

diff --git a/mappingservice/netconf/src/main/yang/lfm-ncc-provider-impl.yang b/mappingservice/netconf/src/main/yang/lfm-ncc-provider-impl.yang
index e20972254c784ea5644ab1d61f984d3e0a446c04..d5b1c6cd4074de11a531def3360987a21929ebbf 100644 (file)
--- a/mappingservice/netconf/src/main/yang/lfm-ncc-provider-impl.yang
+++ b/mappingservice/netconf/src/main/yang/lfm-ncc-provider-impl.yang
@@ -1,6 +1,6 @@
 module lfm-ncc-provider-impl {
     yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:lispflowmapping:netconf:impl";
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:config:lfm-netconf:impl";
     prefix "lfm-ncc-provider-impl";
 
     import config { prefix config; revision-date 2013-04-05; }

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 02d94b93eccc124c1459db1f4897b559e4cb9edc..ce37f02121d407788334ba8dd326169cda5b92b9 100644 (file)
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -24,7 +24,7 @@
     <module>implementation</module>
     <module>southbound</module>
     <module>neutron</module>
-    <module>netconf</module>
+    <!-- <module>netconf</module> -->
     <module>shell</module>
     <!-- <module>integrationtest</module> -->
   </modules>
@@ -48,11 +48,11 @@
         <artifactId>sal</artifactId>
         <version>0.10.0-SNAPSHOT</version>
       </dependency>
-      <dependency>
+<!--       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-netconf-connector</artifactId>
         <version>${mdsal.version}</version>
-      </dependency>
+      </dependency> -->
     </dependencies>
   </dependencyManagement>