Bug 6486: get right docker instance

Change-Id: I35d7e773dd4f9bccf46a790b6e3699166ba0b6a1
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java
index c6816a0e4830598d2d2cf2f042ec28f13f62ae73..61223c3409858122eb7a55bb551208618334d900 100644 (file)
--- a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java
+++ b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java
@@ -323,7 +323,7 @@ public class DockerOvs implements AutoCloseable {
 
     private String getOvsNumString(int numOvs) {
         if (numOvs == 0) {
-            return "ovs";
+            return "ovs1";
         } else {
             return "ovs" + numOvs;
         }

diff --git a/utils/ovsdb-it-utils/src/main/resources/docker-compose-files/ovs-2.5.0-hwvtep.yml b/utils/ovsdb-it-utils/src/main/resources/docker-compose-files/ovs-2.5.0-hwvtep.yml
index 2840ab663c73c46504753f17eddd8b2b87d47b64..98dbb2e6559ba7cd3d6bcbf5aa60951013506fb7 100644 (file)
--- a/utils/ovsdb-it-utils/src/main/resources/docker-compose-files/ovs-2.5.0-hwvtep.yml
+++ b/utils/ovsdb-it-utils/src/main/resources/docker-compose-files/ovs-2.5.0-hwvtep.yml
@@ -1,4 +1,4 @@
-ovs:
+ovs1:
  image: vpickard/openvswitch:2.5.0
  ports:
    - "6641:6640"