SEBA-405 Update mcord profile to use synchronizer library;
Remove obsolete tests
Change-Id: Ie0d7bcc2820f006f87e242406aaef7442c76d497
diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index f2fe0b8..942ebdb 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -13,7 +13,7 @@
# limitations under the License.
# xosproject/mcord-synchronizer
-FROM xosproject/xos-synchronizer-base:2.1.32
+FROM xosproject/xos-synchronizer-base:2.1.38
COPY xos/synchronizer /opt/xos/synchronizers/mcord
COPY VERSION /opt/xos/synchronizers/mcord/
diff --git a/VERSION b/VERSION
index e010258..157e54f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.5
+2.0.6
diff --git a/test/README.md b/test/README.md
deleted file mode 100644
index 9e8126f..0000000
--- a/test/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# M-CORD tests
-
-This directory contains a simple playbook for creating an M-CORD EPC and
-verifying that it comes up correctly. It can be run on any node with Ansible
-installed and SSH connectivity to the master node of the openstack-helm
-installation.
-
-Invoke the playbook as follows, where "masternode" is the DNS name of the
-master node:
-
-```
-ansible-playbook -i masternode, mcord-cavium-test-playbook.yml
-```
-
-The comma after "masternode" is important; it allows Ansible to run the
-playbook on the remote node without having to specify an inventory file.
\ No newline at end of file
diff --git a/test/mcord-cavium-test-playbook.yml b/test/mcord-cavium-test-playbook.yml
deleted file mode 100644
index 46f5179..0000000
--- a/test/mcord-cavium-test-playbook.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-# 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.
-
-
----
-# mcord-ng40-test-playbook.yml
-# Tests CiaB cord-pod XOS configuration
-
-- name: Run base M-CORD tests
- hosts: all
- become: no
- # These variables could be elevated to the profile. Think about
- # doing this after the E2E test framework is complete.
- vars:
- test_networks:
- - management
- - sgi_network
- - s11_network
- - spgw_network
- - s6a_network
- - db_network
- - flat_network_s1mme
- - flat_network_s1u
- test_services:
- - vmme
- - vhss
- - hssdb
- - vspgwc
- - vspgwu
- test_ports:
- - { vm: vmme, network: management }
- - { vm: vmme, network: s11_network }
- - { vm: vmme, network: s6a_network }
- - { vm: vmme, network: flat_network_s1mme }
- - { vm: vhss, network: management }
- - { vm: vhss, network: s6a_network }
- - { vm: vhss, network: db_network }
- - { vm: hssdb, network: management }
- - { vm: hssdb, network: db_network }
- - { vm: vspgwc, network: management }
- - { vm: vspgwc, network: s11_network }
- - { vm: vspgwc, network: spgw_network }
- - { vm: vspgwu, network: management }
- - { vm: vspgwu, network: flat_network_s1u }
- - { vm: vspgwu, network: sgi_network }
- - { vm: vspgwu, network: spgw_network }
- epc_blueprint: mcord_5
- epc_sync_objects:
- - vspgwu/vspgwutenants
- - vspgwc/vspgwctenants
- - vmme/vmmetenants
- - vhss/vhsstenants
- - hssdb/hssdbserviceinstances
- roles:
- - create-epc
- - test-mcord-base
- - epc-synced
diff --git a/test/mcord-mwc-demo-playbook.yml b/test/mcord-mwc-demo-playbook.yml
deleted file mode 100644
index 9950997..0000000
--- a/test/mcord-mwc-demo-playbook.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-# 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.
-
-
----
-# mcord-mwc-demo-playbook.yml
-# Set up XOS for the MWC 2018 demos
-
-- name: Run base M-CORD tests
- hosts: all
- become: no
- # These variables could be elevated to the profile. Think about
- # doing this after the E2E test framework is complete.
- vars:
- test_networks:
- - management
- - sgi_network
- - s11_network
- - spgw_network
- - s6a_network
- - db_network
- - flat_network_s1mme
- - flat_network_s1u
- test_services:
- - vmme
- - vhss
- - hssdb
- - vspgwc
- - vspgwu
- - internetemulator
- test_ports:
- - { vm: vmme, network: management }
- - { vm: vmme, network: s11_network }
- - { vm: vmme, network: s6a_network }
- - { vm: vmme, network: flat_network_s1mme }
- - { vm: vhss, network: management }
- - { vm: vhss, network: s6a_network }
- - { vm: vhss, network: db_network }
- - { vm: hssdb, network: management }
- - { vm: hssdb, network: db_network }
- - { vm: vspgwc, network: management }
- - { vm: vspgwc, network: s11_network }
- - { vm: vspgwc, network: spgw_network }
- - { vm: vspgwu, network: management }
- - { vm: vspgwu, network: flat_network_s1u }
- - { vm: vspgwu, network: sgi_network }
- - { vm: vspgwu, network: spgw_network }
- - { vm: internetemulator, network: management }
- - { vm: internetemulator, network: sgi_network }
- epc_blueprint: mcord_5
- epc_sync_objects:
- - internetemulator/internetemulatorserviceinstances
- - hssdb/hssdbserviceinstances
- - vhss/vhsstenants
- - vmme/vmmetenants
- - vspgwu/vspgwutenants
- - vspgwc/vspgwctenants
- roles:
- - create-internetemulator
- - create-epc
- - test-mcord-base
- - epc-synced
diff --git a/test/mcord-ng40-test-playbook.yml b/test/mcord-ng40-test-playbook.yml
deleted file mode 100644
index 2f906a3..0000000
--- a/test/mcord-ng40-test-playbook.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-# 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.
-
-
----
-# mcord-ng40-test-playbook.yml
-# Tests CiaB cord-pod XOS configuration
-
-- name: Run base M-CORD tests
- hosts: head
- become: no
- # These variables could be elevated to the profile. Think about
- # doing this after the E2E test framework is complete.
- vars:
- test_networks:
- - management
- - sgi_network
- - s11_network
- - spgw_network
- test_services:
- - venb
- - vspgwc
- - vspgwu
- test_ports:
- - { vm: venb, network: management }
- - { vm: venb, network: s11_network }
- - { vm: venb, network: sgi_network }
- - { vm: venb, network: s1u_network }
- - { vm: vspgwc, network: management }
- - { vm: vspgwc, network: s11_network }
- - { vm: vspgwc, network: spgw_network }
- - { vm: vspgwu, network: management }
- - { vm: vspgwu, network: s1u_network }
- - { vm: vspgwu, network: sgi_network }
- - { vm: vspgwu, network: spgw_network }
- epc_blueprint: build
- epc_sync_objects:
- - vspgwu/vspgwutenants
- - vspgwc/vspgwctenants
- - venb/venbserviceinstances
- roles:
- - create-epc
- - test-mcord-base
- - epc-synced
- - run-ng40
diff --git a/test/roles/create-epc/defaults/main.yml b/test/roles/create-epc/defaults/main.yml
deleted file mode 100644
index e9b5861..0000000
--- a/test/roles/create-epc/defaults/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-
-# 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.
-
-# roles/create-epc/defaults/main.yml
-
-xos_admin_user: "admin@opencord.org"
-xos_admin_pass: "letmein"
-
-epc_blueprint: "mcord_5"
-
-xos_api_url: "http://xos-gui.default.svc.cluster.local:4000"
\ No newline at end of file
diff --git a/test/roles/create-epc/tasks/main.yml b/test/roles/create-epc/tasks/main.yml
deleted file mode 100644
index cbf5cf8..0000000
--- a/test/roles/create-epc/tasks/main.yml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-
-# 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.
-
-# roles/create-epc/tasks/main.yml
-
-- name: Check for EPC ServiceInstance
- uri:
- url: "{{ xos_api_url }}/xosapi/v1/vepc/vepcserviceinstances"
- user: "{{ xos_admin_user }}"
- password: "{{ xos_admin_pass }}"
- return_content: yes
- force_basic_auth: yes
- register: result
-
-- name: Get EPC Service ID
- uri:
- url: "{{ xos_api_url }}/xosapi/v1/vepc/vepcservices"
- user: "{{ xos_admin_user }}"
- password: "{{ xos_admin_pass }}"
- return_content: yes
- force_basic_auth: yes
- register: vepcservice
- when: not result.json["items"]
-
-- name: Create EPC
- uri:
- url: "{{ xos_api_url }}/xosapi/v1/vepc/vepcserviceinstances"
- user: "{{ xos_admin_user }}"
- password: "{{ xos_admin_pass }}"
- force_basic_auth: yes
- method: POST
- body:
- blueprint: "{{ epc_blueprint }}"
- owner_id: "{{ vepcservice.json['items'][0]['id'] }}"
- site_id: 1
- body_format: json
- when: not result.json["items"]
diff --git a/test/roles/create-internetemulator/defaults/main.yml b/test/roles/create-internetemulator/defaults/main.yml
deleted file mode 100644
index 434e68c..0000000
--- a/test/roles/create-internetemulator/defaults/main.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-
-# 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.
-
-# roles/create-internetemulator/defaults/main.yml
-
-xos_admin_user: "admin@opencord.org"
-xos_admin_pass: "letmein"
-xos_tosca_url: "http://xos-tosca.default.svc.cluster.local:9102"
diff --git a/test/roles/create-internetemulator/tasks/main.yml b/test/roles/create-internetemulator/tasks/main.yml
deleted file mode 100644
index 30abc91..0000000
--- a/test/roles/create-internetemulator/tasks/main.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-
-# 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.
-
-# roles/create-internetemulator/tasks/main.yml
-
-- name: TOSCA to create internetemulator
- template:
- src: "internetemulator.yaml.j2"
- dest: "/tmp/internetemulator.yaml"
-
-- name: Read internetemulator.yaml
- slurp:
- src: "/tmp/internetemulator.yaml"
- register: slurpfile
-
-- name: Add InternetEmulatorServiceInstance via TOSCA
- uri:
- url: "{{ xos_tosca_url }}/run"
- method: POST
- headers:
- xos-username: "{{ xos_admin_user }}"
- xos-password: "{{ xos_admin_pass }}"
- body: "{{ slurpfile['content'] | b64decode }}"
- status_code: 200
- register: result
- until: result is success
- retries: 50
- delay: 5
diff --git a/test/roles/create-internetemulator/templates/internetemulator.yaml.j2 b/test/roles/create-internetemulator/templates/internetemulator.yaml.j2
deleted file mode 100644
index 5fcedf0..0000000
--- a/test/roles/create-internetemulator/templates/internetemulator.yaml.j2
+++ /dev/null
@@ -1,42 +0,0 @@
-{#
-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.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/internetemulatorservice.yaml
- - custom_types/internetemulatorserviceinstance.yaml
-
-description: configure an internetemulatorserviceinstance
-
-topology_template:
- node_templates:
-
- internetemulator:
- type: tosca.nodes.InternetEmulatorService
- properties:
- name: internetemulator
- must-exist: true
-
- internetemulator_serviceinstance:
- type: tosca.nodes.InternetEmulatorServiceInstance
- properties:
- name: VLC video server
- requirements:
- - owner:
- node: internetemulator
- relationship: tosca.relationships.BelongsToOne
diff --git a/test/roles/epc-synced/defaults/main.yml b/test/roles/epc-synced/defaults/main.yml
deleted file mode 100644
index fabcc1d..0000000
--- a/test/roles/epc-synced/defaults/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-
-# 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.
-
-# roles/epc-synced/defaults/main.yml
-
-xos_admin_user: "admin@opencord.org"
-xos_admin_pass: "letmein"
-
-epc_sync_objects: []
-
-xos_api_url: "http://xos-gui.default.svc.cluster.local:4000"
diff --git a/test/roles/epc-synced/tasks/main.yml b/test/roles/epc-synced/tasks/main.yml
deleted file mode 100644
index 6552ae0..0000000
--- a/test/roles/epc-synced/tasks/main.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-
-# 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.
-
-# roles/epc-synced/tasks/main.yml
-
-- name: Wait for synchronizers to run
- uri:
- url: "{{ xos_api_url }}/xosapi/v1/{{ item }}"
- user: "{{ xos_admin_user }}"
- password: "{{ xos_admin_pass }}"
- return_content: yes
- force_basic_auth: yes
- register: result
- until: result.json["items"] and result.json["items"][0]["backend_status"] == "OK"
- retries: 20
- delay: 30
- with_items: "{{ epc_sync_objects }}"
diff --git a/test/roles/run-ng40/defaults/main.yml b/test/roles/run-ng40/defaults/main.yml
deleted file mode 100644
index 0253d35..0000000
--- a/test/roles/run-ng40/defaults/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-
-# 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.
-
-mcord_ng40_license_email: do.not.distribute@opennetworking.org
-mcord_ng40_login: ng40
-mcord_ng40_password: ng40
\ No newline at end of file
diff --git a/test/roles/run-ng40/tasks/main.yml b/test/roles/run-ng40/tasks/main.yml
deleted file mode 100644
index 49dafaf..0000000
--- a/test/roles/run-ng40/tasks/main.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-
-# 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.
-
-- name: Get ID of VM
- shell: bash -c "source /opt/cord_profile/admin-openrc.sh; nova list --all-tenants|grep mysite_venb|cut -d '|' -f 2"
- register: nova_id
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get mgmt IP of VM
- shell: bash -c "source /opt/cord_profile/admin-openrc.sh; nova interface-list {{ nova_id.stdout }}|grep -o -m 1 '172\.27\.[[:digit:]]*\.[[:digit:]]*'"
- register: mgmt_ip
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Get name of compute node
- shell: bash -c "source /opt/cord_profile/admin-openrc.sh; nova show {{ nova_id.stdout }}|grep hypervisor_hostname|cut -d '|' -f 3"
- register: node_name
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Write email address to file
- shell: sshpass -p {{ mcord_ng40_password }} ssh -o ProxyCommand="ssh -W %h:%p -l ubuntu {{ node_name.stdout }}" {{ mcord_ng40_login }}@{{ mgmt_ip.stdout }} "sudo bash -c 'echo {{ mcord_ng40_license_email }} > /opt/ng4t/etc/email'"
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Run ./verify_quick.sh and check for VERDICT_PASS
- shell: sshpass -p {{ mcord_ng40_password }} ssh -o ProxyCommand="ssh -W %h:%p -l ubuntu {{ node_name.stdout }}" {{ mcord_ng40_login }}@{{ mgmt_ip.stdout }} "./verify_quick.sh"
- register: result
- failed_when: "'VERDICT_PASS' not in result.stdout"
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Print result of test
- debug:
- var: result.stdout_lines
\ No newline at end of file
diff --git a/test/roles/test-mcord-base/defaults/main.yml b/test/roles/test-mcord-base/defaults/main.yml
deleted file mode 100644
index f4572f7..0000000
--- a/test/roles/test-mcord-base/defaults/main.yml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-# 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.
-
-# test-mcord-base/defaults/main.yml
-
-test_networks:
- - management
- - sgi_network
- - s11_network
- - s1mme_network
- - sbi_network
- - nbi_network
-
-test_services:
- - internetemulator
- - vmme
- - vspgwc
- - sdncontroller
- - vspgwu
-
-test_ports:
- - { vm: vmme, network: management }
- - { vm: vmme, network: s11_network }
- - { vm: vmme, network: s1mme_network }
- - { vm: vspgwc, network: management }
- - { vm: vspgwc, network: s11_network }
- - { vm: vspgwc, network: nbi_network }
- - { vm: sdncontroller, network: management }
- - { vm: sdncontroller, network: nbi_network }
- - { vm: sdncontroller, network: sbi_network }
- - { vm: vspgwu, network: management }
- - { vm: vspgwu, network: s1u_network }
- - { vm: vspgwu, network: sgi_network }
- - { vm: vspgwu, network: sbi_network }
- - { vm: internetemulator, network: management }
- - { vm: internetemulator, network: sgi_network }
diff --git a/test/roles/test-mcord-base/tasks/main.yml b/test/roles/test-mcord-base/tasks/main.yml
deleted file mode 100644
index 27b537b..0000000
--- a/test/roles/test-mcord-base/tasks/main.yml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-# 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.
-
-# test-mcord-base/tasks/main.yml
-# Run tests to check that the base elements of M-CORD are present
-
-- name: Wait for networks to be synchronized
- shell: export OS_CLOUD=openstack_helm; openstack network list|grep '{{ item }}' > /dev/null
- args:
- executable: /bin/bash
- register: result
- until: result is success
- retries: 10
- delay: 60
- with_items: "{{ test_networks }}"
- tags:
- - skip_ansible_lint # running a sub job
- changed_when: False
-
-- name: Wait for VMs to come up
- shell: export OS_CLOUD=openstack_helm; openstack server list --all-projects|grep '{{ item }}.*\(ACTIVE\|ERROR\)' > /dev/null
- args:
- executable: /bin/bash
- register: result
- until: result is success
- retries: 10
- delay: 60
- with_items: "{{ test_services }}"
- tags:
- - skip_ansible_lint # running a sub job
- changed_when: False
-
-- name: Delete any VMs that are in ERROR state (XOS will re-create them)
- shell: export OS_CLOUD=openstack_helm; for vm in $(openstack server list --all-projects|grep 'ERROR'|awk '{ print $2 }'); do openstack server delete $vm; done
- args:
- executable: /bin/bash
- tags:
- - skip_ansible_lint # running a sub job
-
-- name: Wait for VMs to come up
- shell: export OS_CLOUD=openstack_helm; openstack server list --all-projects|grep '{{ item }}.*ACTIVE' > /dev/null
- args:
- executable: /bin/bash
- register: result
- until: result is success
- retries: 10
- delay: 60
- with_items: "{{ test_services }}"
- tags:
- - skip_ansible_lint # running a sub job
- changed_when: False
-
-- name: Verify that VMs are properly networked
- shell: export OS_CLOUD=openstack_helm; openstack server list --all-projects|grep '{{ item.vm }}.*ACTIVE.*{{ item.network }}' > /dev/null
- args:
- executable: /bin/bash
- with_items: "{{ test_ports }}"
- tags:
- - skip_ansible_lint # running a sub job
- changed_when: False
\ No newline at end of file
diff --git a/xos/synchronizer/mcord-synchronizer.py b/xos/synchronizer/mcord-synchronizer.py
index f9ea235..205bd4a 100644
--- a/xos/synchronizer/mcord-synchronizer.py
+++ b/xos/synchronizer/mcord-synchronizer.py
@@ -18,9 +18,8 @@
# This imports and runs ../../xos-observer.py
-import importlib
import os
-import sys
+from xossynchronizer import Synchronizer
from xosconfig import Config
base_config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/config.yaml')
@@ -31,7 +30,4 @@
else:
Config.init(base_config_file, 'synchronizer-config-schema.yaml')
-observer_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),"../../synchronizers/new_base")
-sys.path.append(observer_path)
-mod = importlib.import_module("xos-synchronizer")
-mod.main()
+Synchronizer().run()