removing volume mount checks for synchronizer container tests
Change-Id: I9c82e6eff531c6da6204b2d6ccf173995535f14e
diff --git a/roles/xos-container-test-core/tasks/main.yml b/roles/xos-container-test-core/tasks/main.yml
index 56312e7..5f7c22f 100644
--- a/roles/xos-container-test-core/tasks/main.yml
+++ b/roles/xos-container-test-core/tasks/main.yml
@@ -22,17 +22,3 @@
delay: 5
tags:
- skip_ansible_lint # running a sub job
-
-- name: Get Volume Mounts on XOS Core Container
- shell: mount -l | grep xos_services
- register: volumes
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Validate Volume Mounts on XOS CoreContainer
- assert:
- that: "'/opt/xos_services/{{ item.name }}' in volumes.stdout|lower"
- with_items: "{{ xos_services }}"
- when:
- - "'{{ item.name }}' != 'vnodlocal'"
- - "'{{ item.name }}' != 'volt'"
\ No newline at end of file
diff --git a/roles/xos-container-test-fabric/tasks/main.yml b/roles/xos-container-test-fabric/tasks/main.yml
index cacbe7e..0607f76 100644
--- a/roles/xos-container-test-fabric/tasks/main.yml
+++ b/roles/xos-container-test-fabric/tasks/main.yml
@@ -22,18 +22,4 @@
retries: 10
delay: 5
tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get Volume Mounts on XOS Fabric Synchronizer Container
- shell: mount -l | grep xos_services
- register: volumes
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Validate Volume Mounts on XOS Fabric Synchronizer Container
- assert:
- that: "'/opt/xos_services/{{ item.name }}' in volumes.stdout|lower"
- with_items: "{{ xos_services }}"
- when:
- - "'{{ item.name }}' != 'vnodlocal'"
- - "'{{ item.name }}' != 'volt'"
\ No newline at end of file
+ - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-onos/tasks/main.yml b/roles/xos-container-test-onos/tasks/main.yml
index 4585b1f..11d1a8a 100644
--- a/roles/xos-container-test-onos/tasks/main.yml
+++ b/roles/xos-container-test-onos/tasks/main.yml
@@ -21,18 +21,4 @@
retries: 10
delay: 5
tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get Volume Mounts on XOS ONOS Synchronizer Container
- shell: mount -l | grep xos_services
- register: volumes
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Validate Volume Mounts on XOS ONOS Synchronizer Container
- assert:
- that: "'/opt/xos_services/{{ item.name }}' in volumes.stdout|lower"
- with_items: "{{ xos_services }}"
- when:
- - "'{{ item.name }}' != 'vnodlocal'"
- - "'{{ item.name }}' != 'volt'"
\ No newline at end of file
+ - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-openstack/tasks/main.yml b/roles/xos-container-test-openstack/tasks/main.yml
index 896a84f..1deefaf 100644
--- a/roles/xos-container-test-openstack/tasks/main.yml
+++ b/roles/xos-container-test-openstack/tasks/main.yml
@@ -21,18 +21,4 @@
retries: 10
delay: 5
tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get Volume Mounts on XOS Openstack Synchronizer Container
- shell: mount -l | grep xos_services
- register: volumes
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Validate Volume Mounts on XOS Openstack Synchronizer Container
- assert:
- that: "'/opt/xos_services/{{ item.name }}' in volumes.stdout|lower"
- with_items: "{{ xos_services }}"
- when:
- - "'{{ item.name }}' != 'vnodlocal'"
- - "'{{ item.name }}' != 'volt'"
\ No newline at end of file
+ - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-ui/tasks/main.yml b/roles/xos-container-test-ui/tasks/main.yml
index 85909c0..9b3b05b 100644
--- a/roles/xos-container-test-ui/tasks/main.yml
+++ b/roles/xos-container-test-ui/tasks/main.yml
@@ -23,18 +23,4 @@
retries: 10
delay: 5
tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get Volume Mounts on UI Container
- shell: mount -l | grep xos_services
- register: volumes
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Validate Volume Mounts on UI Container
- assert:
- that: "'/opt/xos_services/{{ item.name }}' in volumes.stdout|lower"
- with_items: "{{ xos_services }}"
- when:
- - "'{{ item.name }}' != 'vnodlocal'"
- - "'{{ item.name }}' != 'volt'"
+ - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-vee/tasks/main.yml b/roles/xos-container-test-vee/tasks/main.yml
index d822011..97f7d1d 100644
--- a/roles/xos-container-test-vee/tasks/main.yml
+++ b/roles/xos-container-test-vee/tasks/main.yml
@@ -22,18 +22,4 @@
retries: 10
delay: 5
tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get Volume Mounts on XOS VEE Synchronizer Container
- shell: mount -l | grep xos_services
- register: volumes
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Validate Volume Mounts on XOS VEE Synchronizer Container
- assert:
- that: "'/opt/xos_services/{{ item.name }}' in volumes.stdout|lower"
- with_items: "{{ xos_services }}"
- when:
- - "'{{ item.name }}' != 'vnodlocal'"
- - "'{{ item.name }}' != 'volt'"
\ No newline at end of file
+ - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-veg/tasks/main.yml b/roles/xos-container-test-veg/tasks/main.yml
index 46e969d..f6de2c9 100644
--- a/roles/xos-container-test-veg/tasks/main.yml
+++ b/roles/xos-container-test-veg/tasks/main.yml
@@ -22,18 +22,4 @@
retries: 10
delay: 5
tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get Volume Mounts on XOS VEG Synchronizer Container
- shell: mount -l | grep xos_services
- register: volumes
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Validate Volume Mounts on XOS VEG Synchronizer Container
- assert:
- that: "'/opt/xos_services/{{ item.name }}' in volumes.stdout|lower"
- with_items: "{{ xos_services }}"
- when:
- - "'{{ item.name }}' != 'vnodlocal'"
- - "'{{ item.name }}' != 'volt'"
\ No newline at end of file
+ - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-vnaas/tasks/main.yml b/roles/xos-container-test-vnaas/tasks/main.yml
index 482c843..2fa9312 100644
--- a/roles/xos-container-test-vnaas/tasks/main.yml
+++ b/roles/xos-container-test-vnaas/tasks/main.yml
@@ -13,7 +13,7 @@
# limitations under the License.
-#xos-vnod-sync tests
+#xos-vnaas-sync tests
- name: Check XOS VNAAS Synchronizer Process
shell: ps -f | grep "python vnaas-synchronizer.py -C /opt/xos/synchronizers/vnaas/vnaas_synchronizer_config"
diff --git a/roles/xos-container-test-vnod/tasks/main.yml b/roles/xos-container-test-vnod/tasks/main.yml
index d949ce4..b8b3c11 100644
--- a/roles/xos-container-test-vnod/tasks/main.yml
+++ b/roles/xos-container-test-vnod/tasks/main.yml
@@ -22,18 +22,4 @@
retries: 10
delay: 5
tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get Volume Mounts on XOS VNOD Synchronizer Container
- shell: mount -l | grep xos_services
- register: volumes
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Validate Volume Mounts on XOS VNOD Synchronizer Container
- assert:
- that: "'/opt/xos_services/{{ item.name }}' in volumes.stdout|lower"
- with_items: "{{ xos_services }}"
- when:
- - "'{{ item.name }}' != 'vnodlocal'"
- - "'{{ item.name }}' != 'volt'"
\ No newline at end of file
+ - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-vrouter/tasks/main.yml b/roles/xos-container-test-vrouter/tasks/main.yml
index ea2fc81..8e72c13 100644
--- a/roles/xos-container-test-vrouter/tasks/main.yml
+++ b/roles/xos-container-test-vrouter/tasks/main.yml
@@ -23,18 +23,4 @@
retries: 10
delay: 5
tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get Volume Mounts on XOS VROUTER Synchronizer Container
- shell: mount -l | grep xos_services
- register: volumes
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Validate Volume Mounts on XOS VROUTER Synchronizer Container
- assert:
- that: "'/opt/xos_services/{{ item.name }}' in volumes.stdout|lower"
- with_items: "{{ xos_services }}"
- when:
- - "'{{ item.name }}' != 'vnodlocal'"
- - "'{{ item.name }}' != 'volt'"
\ No newline at end of file
+ - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-vsg/tasks/main.yml b/roles/xos-container-test-vsg/tasks/main.yml
index f310fc2..343c553 100644
--- a/roles/xos-container-test-vsg/tasks/main.yml
+++ b/roles/xos-container-test-vsg/tasks/main.yml
@@ -22,18 +22,4 @@
retries: 10
delay: 5
tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get Volume Mounts on XOS VSG Synchronizer Container
- shell: mount -l | grep xos_services
- register: volumes
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Validate Volume Mounts on XOS VSG Synchronizer Container
- assert:
- that: "'/opt/xos_services/{{ item.name }}' in volumes.stdout|lower"
- with_items: "{{ xos_services }}"
- when:
- - "'{{ item.name }}' != 'vnodlocal'"
- - "'{{ item.name }}' != 'volt'"
\ No newline at end of file
+ - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-vtn/tasks/main.yml b/roles/xos-container-test-vtn/tasks/main.yml
new file mode 100644
index 0000000..cbe460e
--- /dev/null
+++ b/roles/xos-container-test-vtn/tasks/main.yml
@@ -0,0 +1,25 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+#xos-vtn-sync tests
+
+- name: Check XOS VTN Synchronizer Process
+ shell: ps -f | grep "python vtn-synchronizer.py -C /opt/xos/synchronizers/vtn/vtn_synchronizer_config"
+ register: result
+ until: result | success
+ retries: 10
+ delay: 5
+ tags:
+ - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-vtr/tasks/main.yml b/roles/xos-container-test-vtr/tasks/main.yml
new file mode 100644
index 0000000..91cb2cc
--- /dev/null
+++ b/roles/xos-container-test-vtr/tasks/main.yml
@@ -0,0 +1,25 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+#xos-vtr-sync tests
+
+- name: Check XOS VTR Synchronizer Process
+ shell: ps -f | grep "python vtr-synchronizer.py -C /opt/xos/synchronizers/vtr/vtr_synchronizer_config"
+ register: result
+ until: result | success
+ retries: 10
+ delay: 5
+ tags:
+ - skip_ansible_lint # running a sub job