Remove the default loopback mount from the old connector feature

This is conflicting in sft when two projects pull in the old feature
and the new clustered topology feature. Cfg subsystem should have no
users now so remove it.

Change-Id: I97819282f39af332fa78bf58cbb99321ffa79ae0
Signed-off-by: Tomas Cere <tcere@cisco.com>

diff --git a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
index 1d740e7ddf9c7c73612681e7b366fb6e5a429dff..bd07645b71785fe65460a81a02feaf6cb40a40f5 100644 (file)
--- a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
+++ b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
@@ -23,7 +23,7 @@
     <version>1.4.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Netconf Connector :: Netconf Callhome Connector + Netconf SSH Server + loopback connection configuration</name>
+    <name>OpenDaylight :: Netconf Connector :: Netconf Callhome Connector + Netconf SSH Server</name>
 
     <dependencies>
         <dependency>
@@ -33,11 +33,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-connector-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>callhome-model</artifactId>

diff --git a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml b/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
index 25e7e23acbf28e79e7fb60354785bedc972fea59..a6c5ea3a558cd0731dd81c6c073e4443f3ab62bf 100644 (file)
--- a/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
+++ b/features/netconf-connector/odl-netconf-connector-ssh/pom.xml
@@ -23,7 +23,7 @@
     <version>1.4.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Netconf Connector :: Netconf Connector + Netconf SSH Server + loopback connection configuration</name>
+    <name>!!!DEPRECATED!!! OpenDaylight :: Netconf Connector :: Netconf Connector + Netconf SSH Server</name>
 
     <dependencies>
         <dependency>
@@ -33,10 +33,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-connector-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 7a9f79968cd6ae57ba909e858cdf298a61f3e55a..85a07ab71494e8f0a7d970d6125652b338ecfd45 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -130,10 +130,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>callhome-protocol</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>netconf-connector-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-config</artifactId>

diff --git a/netconf/netconf-artifacts/pom.xml b/netconf/netconf-artifacts/pom.xml
index a3a3c605710c4c374d6dbc2d5bfe07ab786d6142..699395b2488dbb315e7a4387a31166c7d8dd6047 100644 (file)
--- a/netconf/netconf-artifacts/pom.xml
+++ b/netconf/netconf-artifacts/pom.xml
@@ -69,11 +69,6 @@
                 <artifactId>netconf-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netconf-connector-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>mdsal-netconf-connector</artifactId>

diff --git a/netconf/netconf-connector-config/pom.xml b/netconf/netconf-connector-config/pom.xml
deleted file mode 100644 (file)
index feda712..0000000
--- a/netconf/netconf-connector-config/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.odlparent</groupId>
-        <artifactId>bundle-parent</artifactId>
-        <version>2.0.5</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>netconf-connector-config</artifactId>
-    <description>Configuration files for netconf-connector</description>
-    <version>1.4.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-topology</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Embed-Dependency>netconf-topology</Embed-Dependency>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

diff --git a/netconf/netconf-connector-config/src/main/resources/org/opendaylight/blueprint/netconf-connector.xml b/netconf/netconf-connector-config/src/main/resources/org/opendaylight/blueprint/netconf-connector.xml
deleted file mode 100644 (file)
index 7312471..0000000
--- a/netconf/netconf-connector-config/src/main/resources/org/opendaylight/blueprint/netconf-connector.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2016 Inocybe Technologies 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
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0"
-           odl:use-default-for-reference-types="true">
-
-    <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
-    <odl:static-reference id="netconfConnectorFactory" interface="org.opendaylight.netconf.topology.api.NetconfConnectorFactory"/>
-
-    <cm:property-placeholder persistent-id="org.opendaylight.netconf.sal.connect"
-                             update-strategy="none">
-        <cm:default-properties>
-            <cm:property name="name" value="controller-config"/>
-            <cm:property name="address" value="127.0.0.1"/>
-            <cm:property name="port" value="1830"/>
-            <cm:property name="username" value="admin"/>
-            <cm:property name="password" value="admin"/>
-            <cm:property name="tcp-only" value="false"/>
-            <cm:property name="reconnect-on-schema-change" value="true"/>
-        </cm:default-properties>
-    </cm:property-placeholder>
-
-    <bean id="controllerConfig" factory-ref="netconfConnectorFactory" factory-method="newInstance">
-        <argument ref="dataBroker"/>
-        <argument type="java.lang.String" value="${name}"/>
-        <argument type="java.lang.String" value="${address}"/>
-        <argument type="java.lang.Integer" value="${port}"/>
-        <argument type="java.lang.String" value="${username}"/>
-        <argument type="java.lang.String" value="${password}"/>
-        <argument type="java.lang.Boolean" value="${tcp-only}"/>
-        <argument type="java.lang.Boolean" value="${reconnect-on-schema-change}"/>
-    </bean>
-
-</blueprint>
\ No newline at end of file

diff --git a/netconf/pom.xml b/netconf/pom.xml
index 2eb593af7aa297236e53579b9c10e45ade1ae797..5e24837ccc49163815f712a9282d90569cab48a6 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -42,7 +42,6 @@
     <module>netconf-ssh</module>
     <module>netconf-tcp</module>
     <module>netconf-monitoring</module>
-    <module>netconf-connector-config</module>
     <module>netconf-auth</module>
     <module>aaa-authn-odl-plugin</module>
     <module>netconf-notifications-impl</module>