From 9218f99166e126e599e59ca64074d0aaac8c2382 Mon Sep 17 00:00:00 2001
From: dongxiancun <dongxiancun@cmhi.chinamobile.com>
Date: Wed, 14 Aug 2019 18:31:43 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20aaa-12=20=E4=BF=9D=E8=AF=81feature-huawei?=
 =?UTF-8?q?-driver=E8=83=BD=E7=8B=AC=E7=AB=8B=E4=BA=8E=E9=A9=B1=E5=8A=A8?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E5=B1=82=E5=8D=B8=E8=BD=BD=E3=80=82=20RCA?=
 =?UTF-8?q?=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9A?=
 =?UTF-8?q?dongxiancun=20=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Adongxiancun?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../driver-layer/drivers/huawei/pom.xml       |   1 +
 .../features/feature-adaptation-layer/pom.xml |  82 ++++++
 .../features/features-driver-all/pom.xml      |   7 +
 .../features/huawei-driver/pom.xml            | 264 ++++++++----------
 ControlPlatform/driver-layer/features/pom.xml |   3 +-
 5 files changed, 207 insertions(+), 150 deletions(-)
 create mode 100644 ControlPlatform/driver-layer/features/feature-adaptation-layer/pom.xml

diff --git a/ControlPlatform/driver-layer/drivers/huawei/pom.xml b/ControlPlatform/driver-layer/drivers/huawei/pom.xml
index 2fbd6672b..f18782f5e 100644
--- a/ControlPlatform/driver-layer/drivers/huawei/pom.xml
+++ b/ControlPlatform/driver-layer/drivers/huawei/pom.xml
@@ -44,6 +44,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>${project.groupId}</groupId>
             <artifactId>adaptation-layer</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/ControlPlatform/driver-layer/features/feature-adaptation-layer/pom.xml b/ControlPlatform/driver-layer/features/feature-adaptation-layer/pom.xml
new file mode 100644
index 000000000..b5cabece8
--- /dev/null
+++ b/ControlPlatform/driver-layer/features/feature-adaptation-layer/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright © 2019 CMCC Corporation 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 INTERNAL
+-->
+<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>3.1.4</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>com.cmcc.cmhi</groupId>
+    <artifactId>feature-adaptation-layer</artifactId>
+    <version>0.1.0</version>
+    <packaging>feature</packaging>
+
+    <name>CMCC :: CMHI :: AdaptationLayer</name>
+
+    <properties>
+        <controller.mdsal.version>1.7.4</controller.mdsal.version>
+        <mdsal.version>2.4.4</mdsal.version>
+        <mdsal.model.version>0.12.4</mdsal.model.version>
+        <restconf.version>1.7.4</restconf.version>
+        <yangtools.version>2.0.6.5</yangtools.version>
+        <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-artifacts</artifactId>
+                <version>${restconf.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-rest-docgen</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>features-yangtools</artifactId>
+            <classifier>features</classifier>
+            <version>${yangtools.version}</version>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features-mdsal</artifactId>
+            <classifier>features</classifier>
+            <version>${controller.mdsal.version}</version>
+            <type>xml</type>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features-restconf</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>com.cmcc.cmhi</groupId>
+            <artifactId>adaptation-layer</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/ControlPlatform/driver-layer/features/features-driver-all/pom.xml b/ControlPlatform/driver-layer/features/features-driver-all/pom.xml
index 5665a42f0..cb2069e46 100644
--- a/ControlPlatform/driver-layer/features/features-driver-all/pom.xml
+++ b/ControlPlatform/driver-layer/features/features-driver-all/pom.xml
@@ -26,6 +26,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <dependencies>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>feature-adaptation-layer</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>feature-huawei-driver</artifactId>
diff --git a/ControlPlatform/driver-layer/features/huawei-driver/pom.xml b/ControlPlatform/driver-layer/features/huawei-driver/pom.xml
index 7e4b91f96..54f35c117 100644
--- a/ControlPlatform/driver-layer/features/huawei-driver/pom.xml
+++ b/ControlPlatform/driver-layer/features/huawei-driver/pom.xml
@@ -1,161 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright © 2019 CMCC Corporation and others. All rights reserved.
+<!-- Copyright © 2019 CMCC Corporation 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 INTERNAL -->
+<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">
 
-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 INTERNAL
--->
-<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>
 
-    <modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.opendaylight.odlparent</groupId>
+		<artifactId>single-feature-parent</artifactId>
+		<version>3.1.4</version>
+		<relativePath />
+	</parent>
 
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>3.1.4</version>
-        <relativePath/>
-    </parent>
+	<groupId>com.cmcc.cmhi</groupId>
+	<artifactId>feature-huawei-driver</artifactId>
+	<version>0.1.0</version>
+	<packaging>feature</packaging>
 
-    <groupId>com.cmcc.cmhi</groupId>
-    <artifactId>feature-huawei-driver</artifactId>
-    <version>0.1.0</version>
-    <packaging>feature</packaging>
+	<name>CMCC :: CMHI :: HuaweiDriver</name>
 
-    <name>CMCC :: CMHI :: HuaweiDriver</name>
+	<properties>
+		<controller.mdsal.version>1.7.4</controller.mdsal.version>
+		<mdsal.version>2.4.4</mdsal.version>
+		<mdsal.model.version>0.12.4</mdsal.model.version>
+		<netconf.version>1.4.4</netconf.version>
+		<restconf.version>1.7.4</restconf.version>
+		<yangtools.version>2.0.6.5</yangtools.version>
+		<dlux.version>0.7.4</dlux.version>
+		<dluxapps.version>0.7.4</dluxapps.version>
+		<configfile.directory>etc/opendaylight/karaf</configfile.directory>
+	</properties>
 
-    <properties>
-        <controller.mdsal.version>1.7.4</controller.mdsal.version>
-        <mdsal.version>2.4.4</mdsal.version>
-        <mdsal.model.version>0.12.4</mdsal.model.version>
-        <netconf.version>1.4.4</netconf.version>
-        <restconf.version>1.7.4</restconf.version>
-        <yangtools.version>2.0.6.5</yangtools.version>
-        <dlux.version>0.7.4</dlux.version>
-        <dluxapps.version>0.7.4</dluxapps.version>
-        <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-    </properties>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.opendaylight.netconf</groupId>
+				<artifactId>netconf-artifacts</artifactId>
+				<version>${netconf.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.opendaylight.netconf</groupId>
+				<artifactId>restconf-artifacts</artifactId>
+				<version>${restconf.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-artifacts</artifactId>
-                <version>${netconf.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>${restconf.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+	<dependencies>
+		<dependency>
+			<groupId>org.opendaylight.netconf</groupId>
+			<artifactId>sal-rest-docgen</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.yangtools</groupId>
+			<artifactId>features-yangtools</artifactId>
+			<classifier>features</classifier>
+			<version>${yangtools.version}</version>
+			<type>xml</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.controller</groupId>
+			<artifactId>features-mdsal</artifactId>
+			<classifier>features</classifier>
+			<version>${controller.mdsal.version}</version>
+			<type>xml</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.netconf</groupId>
+			<artifactId>features-restconf</artifactId>
+			<classifier>features</classifier>
+			<type>xml</type>
+			<scope>runtime</scope>
+		</dependency>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-rest-docgen</artifactId>
-            <version>${restconf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
-            <classifier>features</classifier>
-            <version>${yangtools.version}</version>
-            <type>xml</type>
+		<dependency>
+			<groupId>org.opendaylight.netconf</groupId>
+			<artifactId>features-netconf-connector</artifactId>
+			<classifier>features</classifier>
+			<type>xml</type>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.opendaylight.netconf</groupId>
+			<artifactId>features-netconf</artifactId>
+			<classifier>features</classifier>
+			<type>xml</type>
+			<scope>runtime</scope>
+		</dependency>
+		<!-- <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>odl-config-netconf-connector</artifactId> 
+			<version>${netconf.version}</version> <type>xml</type> <classifier>features</classifier> 
+			</dependency> -->
+		<!-- Netconf will not provide schemas without monitoring -->
+		<dependency>
+			<groupId>org.opendaylight.controller</groupId>
+			<artifactId>config-manager-facade-xml</artifactId>
+			<version>0.8.4</version>
+		</dependency>
+		<!-- <dependency> <groupId>org.opendaylight.netconf</groupId> <artifactId>odl-netconf-monitoring</artifactId> 
+			<version>${netconf.version}</version> <type>xml</type> <classifier>features</classifier> 
+			</dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>odl-netconf-console</artifactId> 
+			<version>${netconf.version}</version> <type>xml</type> <classifier>features</classifier> 
+			</dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>odl-netconf-topology</artifactId> 
+			<version>${netconf.version}</version> <type>xml</type> <classifier>features</classifier> 
+			</dependency> -->
 
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <classifier>features</classifier>
-            <version>${controller.mdsal.version}</version>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-restconf</artifactId>
-            <classifier>features</classifier>
-            <version>${restconf.version}</version>
-            <type>xml</type>
+		<!-- 在karaf中打包 <dependency> <groupId>org.opendaylight.dluxapps</groupId> 
+			<artifactId>features-dluxapps</artifactId> <version>${dlux.version}</version> 
+			<classifier>features</classifier> <type>xml</type> </dependency> -->
 
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-netconf-connector</artifactId>
-            <classifier>features</classifier>
-            <version>${netconf.version}</version>
-            <type>xml</type>
-
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-netconf</artifactId>
-            <classifier>features</classifier>
-            <version>${netconf.version}</version>
-            <type>xml</type>
-
-        </dependency>
-        <!--
-        <dependency>
-          <groupId>org.opendaylight.netconf</groupId>
-          <artifactId>odl-config-netconf-connector</artifactId>
-          <version>${netconf.version}</version>
-          <type>xml</type>
-          <classifier>features</classifier>
-        </dependency>
-        -->
-        <!-- Netconf will not provide schemas without monitoring -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager-facade-xml</artifactId>
-            <version>0.8.4</version>
-        </dependency>
-        <!--
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-monitoring</artifactId>
-            <version>${netconf.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-console</artifactId>
-      <version>${netconf.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-topology</artifactId>
-      <version>${netconf.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    -->
-
-        <!-- 在karaf中打包
-        <dependency>
-          <groupId>org.opendaylight.dluxapps</groupId>
-          <artifactId>features-dluxapps</artifactId>
-          <version>${dlux.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        -->
-
-        <dependency>
-            <groupId>com.cmcc.cmhi</groupId>
-            <artifactId>huawei-driver</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>com.cmcc.cmhi</groupId>
+			<artifactId>huawei-driver</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/ControlPlatform/driver-layer/features/pom.xml b/ControlPlatform/driver-layer/features/pom.xml
index 1faf4e44d..ec1e9d5a2 100644
--- a/ControlPlatform/driver-layer/features/pom.xml
+++ b/ControlPlatform/driver-layer/features/pom.xml
@@ -24,7 +24,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <packaging>pom</packaging>
 
     <modules>
-        <module>huawei-driver</module>
         <module>features-driver-all</module>
+        <module>feature-adaptation-layer</module>
+        <module>huawei-driver</module>
     </modules>
 </project>