Remove Affinity from Helium

Change-Id: I3161d3bff8149450002a0f12200bddfb9b6c75df
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/distributions/serviceprovider/pom.xml b/distributions/serviceprovider/pom.xml
index eb22b164ef590cfd80dc24d9ec82442c5a9704ea..7e57a3a981d0d366d1170ad61afc0b3ff0ddf235 100644 (file)
--- a/distributions/serviceprovider/pom.xml
+++ b/distributions/serviceprovider/pom.xml
@@ -36,62 +36,6 @@ see https://git.opendaylight.org/gerrit/#/c/390/
       <scope>provided</scope>
     </dependency>
 
-<!-- commenting Affinity 
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>affinity</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>affinity.implementation</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>affinity.northbound</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>flatl2</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>flatl2.northbound</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>l2agent</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>analytics</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>analytics.implementation</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>analytics.northbound</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
--->
-
     <!--
          BGPCEP: required IETF models
          -->

diff --git a/distributions/virtualization/pom.xml b/distributions/virtualization/pom.xml
index c71c69b844aaed02457c64bc05a308b15389d181..401eef0a2238d656b342d1628790d5c2d0df0cc0 100644 (file)
--- a/distributions/virtualization/pom.xml
+++ b/distributions/virtualization/pom.xml
@@ -73,61 +73,6 @@ see https://git.opendaylight.org/gerrit/#/c/390/
       <classifier>README</classifier>
     </dependency>
 
-    <!-- affinity -->
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>affinity</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>affinity.implementation</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>affinity.northbound</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>flatl2</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>flatl2.northbound</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>l2agent</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>analytics</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>analytics.implementation</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.affinity</groupId>
-      <artifactId>analytics.northbound</artifactId>
-      <version>0.4.2-SNAPSHOT</version>
-    </dependency>
-
     <!-- opendove -->
 
     <dependency>

diff --git a/distributions/virtualization/src/assemble/resources/run.sh b/distributions/virtualization/src/assemble/resources/run.sh
index fdb56267492048e743bb870419a453c37a24c16e..3066de441144f39d3671768314e0552634cd955f 100755 (executable)
--- a/distributions/virtualization/src/assemble/resources/run.sh
+++ b/distributions/virtualization/src/assemble/resources/run.sh
@@ -6,7 +6,7 @@ RUN_BASE_SH=${RUNSH_DIR}/run.base.sh
 
 function usage {
     echo -e "You must select one of the 3 supported network virtualization technologies:\n\tovsdb | opendove | vtn"
-    echo "Usage: $0 -virt {ovsdb | opendove | vtn | affinity} [advanced options]"
+    echo "Usage: $0 -virt {ovsdb | opendove | vtn} [advanced options]"
     echo "Advanced options: $($RUN_BASE_SH -help | sed "s;Usage: $RUN_BASE_SH ;;")"
     exit 1
 }
@@ -30,13 +30,11 @@ if [ "${virt}" == "" ]; then
     usage
 else
     if [ "${virt}" == "ovsdb" ]; then
-        ODL_VIRT_FILTER="opendove|vtn|affinity"
+        ODL_VIRT_FILTER="opendove|vtn"
     elif [ "${virt}" == "opendove" ]; then
         ODL_VIRT_FILTER="ovsdb|vtn"
     elif [ "${virt}" == "vtn" ]; then
-        ODL_VIRT_FILTER="affinity|opendove|ovsdb.neutron|controller.(arphandler|samples)"
-    elif [ "${virt}" == "affinity" ]; then
-        ODL_VIRT_FILTER="vtn|opendove|controller.samples"
+        ODL_VIRT_FILTER="opendove|ovsdb.neutron|controller.(arphandler|samples)"
     else
         usage
     fi