Add SFC

Change-Id: I5291439fd52fb84a0381a1c0d9d173fdfb12a1c3
Signed-off-by: Jaime Caamaño Ruiz <jaime.caamano.ruiz@ericsson.com>
Signed-off-by: Andrej Kilvady <akilvady@cisco.com>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index e70094ed4eab29ab3db0fffa34b17c3b397a3053..3f2ca59903a6f825834bb1e17221dc7b9b642493 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -152,6 +152,15 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- SFC -->
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>features4-sfc</artifactId>
+                <version>${sfc.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- SNMP4SDN -->
             <dependency>
                 <groupId>org.opendaylight.snmp4sdn</groupId>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index e89b1d0369befeb420a36b435c77bbff6aa7e3f6..8d11a4b7bac4e013149783b629a40639e019dadf 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -129,6 +129,71 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- SFC -->
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>odl-sfc-ios-xe-renderer</artifactId>
+                <version>${sfc.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>odl-sfc-netconf</artifactId>
+                <version>${sfc.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>odl-sfc-openflow-renderer</artifactId>
+                <version>${sfc.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>odl-sfc-ovs</artifactId>
+                <version>${sfc.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>odl-sfc-sb-rest</artifactId>
+                <version>${sfc.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>odl-sfc-test-consumer</artifactId>
+                <version>${sfc.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>odl-sfc-ui</artifactId>
+                <version>${sfc.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>odl-sfc-vpp-renderer</artifactId>
+                <version>${sfc.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.sfc</groupId>
+                <artifactId>odl-sfclisp</artifactId>
+                <version>${sfc.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+
             <!-- SNMP4SDN -->
             <dependency>
                 <groupId>org.opendaylight.snmp4sdn</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index f8d101e09088547d40cda827e9472aad0339e890..d9a3505a2bc36b776e477f692584d82b702c3fb3 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -309,6 +309,14 @@
             <type>xml</type>
         </dependency>
 
+        <!-- SFC -->
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>features4-sfc</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- SNMP4SDN -->
         <dependency>
             <groupId>org.opendaylight.snmp4sdn</groupId>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 06a54c5bf4704ef31b5bc2e2ee4a0ee2ef7897c5..4fd72dd598e18f46c62b79e1fc340b6addbf92c9 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -61,12 +61,14 @@
         <!-- External single feature dependencies in alphabetical order -->
 
         <!-- BIER -->
+        <!-- Comment out bier because of SFT memory problem
         <dependency>
             <groupId>org.opendaylight.bier</groupId>
             <artifactId>odl-bier-all</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- COE -->
         <dependency>
@@ -126,6 +128,26 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- SFC -->
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfc-ios-xe-renderer</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfc-openflow-renderer</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfc-vpp-renderer</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- VTN -->
         <dependency>
             <groupId>org.opendaylight.vtn</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 259a444da87d716bdfab45c4ab310a189e5d267a..7cda7ff4357701a51452ed0f07438b39251e26ac 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -131,7 +131,6 @@
         </dependency>
 
         <!-- Honeycomb/VBD -->
-        <!-- Comment out because SFT memory problem
         <dependency>
             <groupId>org.opendaylight.honeycomb.vbd</groupId>
             <artifactId>odl-vbd</artifactId>
@@ -150,7 +149,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
 
         <!-- LISP Flow Mapping -->
         <dependency>
@@ -248,6 +246,44 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- SFC -->
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfc-netconf</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfc-ovs</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfc-sb-rest</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfc-test-consumer</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfc-ui</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.sfc</groupId>
+            <artifactId>odl-sfclisp</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- SNMP4SDN -->
         <dependency>
             <groupId>org.opendaylight.snmp4sdn</groupId>