Docker-compose files for hwvtep IT, ovs 2.4/2.5

Change-Id: Id1b38786f78ee9f9b22e6168c99d9ac3988fc678
Signed-off-by: Josh <jhershbe@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 223eb171dc13c31ed6c9817cb7592fbc9754e1ce..47f8475bc8b3747961c1f82a4d0b8ee6d8c282a0 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
@@ -104,7 +104,7 @@ public class DockerOvs implements AutoCloseable {
                     " -Dovsdbserver.connection=passive -Ddocker.run=false\n";
 
     private static final Logger LOG = LoggerFactory.getLogger(DockerOvs.class);
-    private static final String DEFAULT_DOCKER_FILE = "docker-ovs-2.5.1.yml";
+    private static final String DEFAULT_DOCKER_FILE = "ovs-2.5.0-hwvtep.yml";
     private static final String DOCKER_FILE_PATH = "META-INF/docker-compose-files/";
     private static final int COMPOSE_FILE_IDX = 3;
     private static final int COMPOSE_FILE_IDX_NO_SUDO = 2;

diff --git a/utils/ovsdb-it-utils/src/main/resources/docker-compose-files/ovs-2.4.0-hwvtep.yml b/utils/ovsdb-it-utils/src/main/resources/docker-compose-files/ovs-2.4.0-hwvtep.yml
new file mode 100644 (file)
index 0000000..7b816e5
--- /dev/null
+++ b/utils/ovsdb-it-utils/src/main/resources/docker-compose-files/ovs-2.4.0-hwvtep.yml
@@ -0,0 +1,6 @@
+ovs:
+ image: vpickard/openvswitch:2.4.0
+ ports:
+   - "6641:6640"
+ command: "/usr/bin/supervisord -n"
+ privileged: true

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
new file mode 100644 (file)
index 0000000..2840ab6
--- /dev/null
+++ b/utils/ovsdb-it-utils/src/main/resources/docker-compose-files/ovs-2.5.0-hwvtep.yml
@@ -0,0 +1,6 @@
+ovs:
+ image: vpickard/openvswitch:2.5.0
+ ports:
+   - "6641:6640"
+ command: "/usr/bin/supervisord -n"
+ privileged: true