diff --git a/Jenkinsfile b/Jenkinsfile
index 1e58ed31af010065e4d817495ae54fa733a95272..1259c839b9fa3cf7c6bbd8f14f19b94f13cb2c5c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
node('docker') {
withDockerContainer(
- image: 'tango-levpro:latest',
+ image: 'tango-lmc-base-classes:latest',
args: '-u root'
) {
stage 'Cleanup workspace'
@@ -23,9 +23,9 @@ node('docker') {
timeout(time: 30, unit: 'MINUTES') {
ansiColor('xterm') {
try {
- // Add a symbolic link to levpro dir, as the Ansible scripts
+ // Add a symbolic link to lmc-base-classes dir, as the Ansible scripts
// assume that is part of the path
- sh 'ln -sv $WORKSPACE ../levpro'
+ sh 'ln -sv $WORKSPACE ../lmc-base-classes'
// use Ansible to do pip installs, using current WORKSPACE
// as the software_root
@@ -35,14 +35,14 @@ node('docker') {
cd ansible
ansible-playbook -i hosts install_sw.yml \
--limit "local" \
- --tags install-sw-levpro \
+ --tags install-sw-lmc-base-classes \
--tags install-sw-skabase \
--verbose \
--extra-vars software_root=$PARENT_DIR
pip install coverage
cd ..
'''
-
+
catchError {
// run tests
sh '''
diff --git a/README.md b/README.md
index 81697c6a13dc17f738a373ceb6207916a16dce54..1b95b40160c13c6334de664ebdf837e30b9c4278 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Early work in this repo was done as part of the LMC Base Classes Evolutionary Pr
## Docs
- SKA Control System guidelines: [Google docs folder](https://drive.google.com/drive/folders/0B8fhAW5QnZQWQ2ZlcjhVS0NmRms)
-- LEvPro work area: [Google docs folder](https://drive.google.com/drive/folders/0B8fhAW5QnZQWVHVFVGVXT2Via28)
+- Old LEvPro work area: [Google docs folder](https://drive.google.com/drive/folders/0B8fhAW5QnZQWVHVFVGVXT2Via28)
## Contribute
Contributions are always welcome! Please ensure that you adhere to our coding standards [CAM_Style_guide](https://docs.google.com/document/d/1aZoIyR9tz5rCWr2qJKuMTmKp2IzHlFjrCFrpDDHFypM/edit?usp=sharing). Use [flake8](http://flake8.pycqa.org/en/latest/) for linting (default settings, except maximum line length of 90 characters).
diff --git a/ansible/README.md b/ansible/README.md
index b35233931b769f47a81aed029d4682941493f2f6..276bbace20a39c88fcc4ab6db07587df9adf0117 100644
--- a/ansible/README.md
+++ b/ansible/README.md
@@ -2,31 +2,18 @@
Old notes for LEvPRo deployment can be found in:
[LEvPro Deployment Notes](https://docs.google.com/document/d/12f495FEMOi0g3bJjoZL3icZaCCr7iSjTY3jToFqA2Ns/edit#)
-## Recent changes
-Moving refelt config files from role to inventories
-
-Adding register_my_refelt to support different refelts (e.g. Ref4 on devl4, Ref5 on devl5) with different config files (from inventories) e.g. ./play-task.sh register_my_refelt devl
-
-Added deregister_refelts to remove registrations in Tango DB and Astor so that we can start again (but not added to site.yml) and added support to run a different .yml instead of site.yml e.g. ./play-task.sh deregsiter_refelts.yml
-
-
-## TODO
-
-Get the desired inventories from ansible variables instead of loading files
-
-
# To get going with a fresh node (Docker container):
## Run a Docker container:
-Follow the steps in `../docker/README.md`. Launch the docker with the levpro project mounted inside the container.
+Follow the steps in `../docker/README.md`. Launch the docker with the lmc-base-classes project mounted inside the container.
-Obviously any changes made inside the container, e.g. software installed, will not persist. Images can be made from a running container, if you want to keep changes (read the Docker docs). Note that changes to the files in the levpro project will persist, because these files live on the host machine, and are just mounted inside the container.
+Obviously any changes made inside the container, e.g. software installed, will not persist. Images can be made from a running container, if you want to keep changes (read the Docker docs). Note that changes to the files in the lmc-base-classes project will persist, because these files live on the host machine, and are just mounted inside the container.
-## Install the levpro python modules and register TANGO devices
+## Install the lmc-base-classes python modules and register TANGO devices
```
-cd ~/src/levpro/ansible
-./play-task.sh install-sw
+cd ~/src/lmc-base-classes/ansible
./play-task.sh generate-sw-refelt-simlib
+./play-task.sh install-sw
./play-task.sh register-my-refelt local # startup can take 5 minutes!
```
@@ -34,13 +21,19 @@ Note: `register-refelt` is deprecated.
## Updating after .xmi file changes (POGO generation)
```
-cd ~/src/levpro/ansible
+cd ~/src/lmc-base-classes
+purge_xmi_tree.py --path .
+cd ~/src/lmc-base-classes/ansible
./play-task.sh deregister_refelts.yml
./play-task.sh generate-sw
+./play-task.sh install-sw
./play-task.sh register-my-refelt local
```
-Note: license file text may need to be updated in POGO generated files.
+Notes:
+- license file text may need to be updated in POGO generated files.
+- The deregister_refelts.yml role removes registrations in Tango DB and Astor so that
+ we can start again, with nothing registered.
# To get going with a fresh Ubuntu 14.04 system (not recommended!):
@@ -65,12 +58,12 @@ sudo add-apt-repository ppa:ansible/ansible
sudo apt-get update
sudo apt-get install ansible
mkdir ~/src
-git clone https://github.com/ska-sa/levpro ~/src/levpro
+git clone https://github.com/ska-telescope/lmc-base-classes ~/src/lmc-base-classes
```
-## Deploy tangobox and a levpro RefElt on a fresh node
+## Deploy tangobox and a lmc-base-classes RefElt on a fresh node
```
-cd ~/src/levpro/ansible
+cd ~/src/lmc-base-classes/ansible
./play-task.sh deploy-tangobox
./play-task.sh deploy-sw
./play-task.sh generate-sw
@@ -83,9 +76,12 @@ Optional:
## Updating after .xmi file changes (POGO generation)
```
-cd ~/src/levpro/ansible
+cd ~/src/lmc-base-classes
+purge_xmi_tree.py --path .
+cd ~/src/lmc-base-classes/ansible
./play-task.sh deregister_refelts.yml
./play-task.sh generate-sw
+./play-task.sh install-sw
./play-task.sh register-my-refelt local
```
@@ -137,7 +133,7 @@ or using ansible-playbook directly
ansible-playbook -i hosts install_sw.yml --list-tags [--limit devXX]
ansible-playbook -i hosts install_sw.yml --list-hosts [--limit devXX]
ansible-playbook -i hosts install_sw.yml
-ansible-playbook -i hosts install_sw.yml -t install-sw-levpro
+ansible-playbook -i hosts install_sw.yml -t install-sw-lmc-base-classes
```
### To deploy SW on local: # Git clone if not available, else git pull
@@ -152,52 +148,46 @@ ansible-playbook -i hosts site.yml --limit local --tags "deploy-sw"
### To refresh SW on local: # Git pull
```
./play-task.sh refresh-sw
-./play-task.sh refresh-sw-levpro
+./play-task.sh refresh-sw-lmc-base-classes
```
or using ansible-playbook directly
```
ansible-playbook -i hosts site.yml --limit local --tags "refresh-sw"
-ansible-playbook -i hosts site.yml --limit local --tags "refresh-sw-levpro"
+ansible-playbook -i hosts site.yml --limit local --tags "refresh-sw-lmc-base-classes"
```
### To install SW on local: # sudo pip install
```
./play-task.sh install-sw
-./play-task.sh install-sw-levpro
+./play-task.sh install-sw-lmc-base-classes
./play-task.sh install-sw-skabase
./play-task.sh install-sw-refelt
```
or using ansible-playbook directly
```
ansible-playbook -i hosts site.yml --limit local --tags "install-sw" # all
-ansible-playbook -i hosts site.yml --limit local --tags "install-sw-levpro"
+ansible-playbook -i hosts site.yml --limit local --tags "install-sw-lmc-base-classes"
ansible-playbook -i hosts site.yml --limit local --tags "install-sw-skabase"
ansible-playbook -i hosts site.yml --limit local --tags "install-sw-refelt"
```
-
### To regenerate POGO output
-When XMI or code has been changed
+When XMI has been changed
```
-cd ~/src/levpro/ansible
+cd ~/src/lmc-base-classes
+purge_xmi_tree.py --path .
+cd ~/src/lmc-base-classes/ansible
+./play-task.sh deregister_refelts.yml
./play-task.sh generate-sw
-```
-
-### To configure the RefElt TANGO facility and start its device servers
-```
-./play-task.sh register-refelt
-```
-or
-```
-./play-task.sh register-refelt-in-tangodb
-./play-task.sh register-refelt-in-astor
+./play-task.sh install-sw
+./play-task.sh register-my-refelt local
```
### To configure a specific RefEltX TANGO facility and start its device servers (my_refelt)
-You need to add the group to levpro/ansible/hosts e.g.
+You need to add the group to lmc-base-classes/ansible/hosts e.g.
```
[devXX]
-devXXlevpro
+devXXlmc
```
And group vars for the group in ansible/group_vars/devXX:
@@ -209,32 +199,27 @@ And group vars for the group in ansible/group_vars/devXX:
id: refX
```
-and ansible/host_vars for each host in the group as appropriate, at least:
-```
-ansible_ssh_host: levpro.devXXX.camlab.kat.ac.za
-```
-
-and ansible/host_vars/devXXlevpro for each host in the group as appropriate, at least:
+and ansible/host_vars/devXXlmc for each host in the group as appropriate, at least:
```
-ansible_ssh_host: levpro.devXXX.camlab.kat.ac.za
+ansible_ssh_host: lmc.devXX.domain
```
-Lastly, you need to create an inventory for devXX in ansible/inventories/devXX defining the refXXX element.
+Lastly, you need to create an inventory for devXX in ansible/inventories/devXX defining the refX element.
Note: this may later be templated for RefElts (as it may be a useful pattern for DSH)
(If need be, deregister previous registrations with:)
```
-ansible-playbook deregister-refelts.yml
+./play-task.sh deregister_refelts.yml
```
Then do
```
-ansible-playbook register-my-refelt.yml devXX
+./play-task.sh register-my-refelt devXX
```
this produces the ansible command line (note the --limit):
```
-ansible-playbook -i hosts site.yml --limit devXX --tags register-my-refelt --verbose --ask-become-pass
+ansible-playbook -i hosts site.yml --limit devXX --tags register-my-refelt --verbose
```
# NOTES:
@@ -259,11 +244,11 @@ role-tag defined in in roles/xxx/tasks/main.yml followed by a task specialisatio
E.g. any tag starting with deploy-sw will be found in the deploy_sw.yml role
```
tags:
- - deploy-sw-levpro
+ - deploy-sw-lmc-base-classes
```
To execute a specific task specify the full --tags from the task file e.g.
```
- --tags deploy-sw-levpro
+ --tags deploy-sw-lmc-base-classes
```
Format is "<role-tag>-<task-id>" e.g. install-sw-refelt
```
@@ -275,7 +260,7 @@ To list the current task tags:
```
./play-task.sh
-kat@levpro.devXX.camlab.kat.ac.za:~/src/levpro/ansible$ ./play-task.sh
+tango-cs@95f06d131e41:~/src/lmc-base-classes/ansible$ ./play-task.sh
You have to specify a roletag, and optional task-id
---------------------------<<<< ANSIBLE COMMAND LINE >>>>--------------------------------------------
@@ -287,24 +272,21 @@ The available task tags are:
playbook: site.yml
play #1 (operational): deploy_sw TAGS: []
- TASK TAGS: [deploy-sw, deploy-sw-levpro]
+ TASK TAGS: [deploy-sw, deploy-sw-lmc-base-classes]
play #2 (operational): deploy_tangobox TAGS: []
TASK TAGS: [debs, deploy-box-tango-java, deploy-tangobox, deploy-tangobox-debs, deploy-tangobox-itango, deploy-tangobox-mysql, deploy-tangobox-mysql-installed, deploy-tangobox-pip, deploy-tangobox-start-tango, deploy-tangobox-tango-core, deploy-tangobox-tango-java, deploy-tangobox-tango-java-pogo, deploy-tangobox-tango-webapp, itango, mysql, pip, tango-core, tango-java]
play #3 (operational): install_sw TAGS: []
- TASK TAGS: [install-sw, install-sw-levpro, install-sw-refelt, install-sw-skabase]
+ TASK TAGS: [install-sw, install-sw-lmc-base-classes, install-sw-refelt, install-sw-skabase]
play #4 (operational): refresh_sw TAGS: []
- TASK TAGS: [refresh-sw, refresh-sw-levpro]
-
- play #5 (operational): register_refelt TAGS: []
- TASK TAGS: [register-refelt, register-refelt-in-astor, register-refelt-in-astor-ds-path, register-refelt-in-tangodb]
+ TASK TAGS: [refresh-sw, refresh-sw-lmc-base-classes]
- play #6 (operational): register_my_refelt TAGS: []
+ play #5 (operational): register_my_refelt TAGS: []
TASK TAGS: [register-my-refelt, register-myrefelt-in-astor, register-myrefelt-in-astor-ds-path, register-myrefelt-in-tangodb]
- play #7 (operational): generate_sw TAGS: []
+ play #6 (operational): generate_sw TAGS: []
TASK TAGS: [generate-sw, generate-sw-refelt, generate-sw-refelt-simlib, generate-sw-skabase]
```
diff --git a/ansible/group_vars/devl4 b/ansible/group_vars/dev4
similarity index 84%
rename from ansible/group_vars/devl4
rename to ansible/group_vars/dev4
index 4e14756c4034512628d9d94ff409c9377b4a5e2d..f8e1e9fbfc62de3ef3dda8c215ba5280b91bdaf4 100644
--- a/ansible/group_vars/devl4
+++ b/ansible/group_vars/dev4
@@ -2,7 +2,7 @@
python_path: /usr/lib/python2.7/site-packages
## SOFTWARE BASE DIR
-software_root: /home/kat/git
+software_root: /home/tango-cs/src
## Element personality
element_details:
diff --git a/ansible/group_vars/devl5 b/ansible/group_vars/devl5
deleted file mode 100644
index 4743a014c6df0e7e58b01f0fc67e187e9fd18665..0000000000000000000000000000000000000000
--- a/ansible/group_vars/devl5
+++ /dev/null
@@ -1,14 +0,0 @@
----
-python_path: /usr/lib/python2.7/site-packages
-
-## SOFTWARE BASE DIR
-software_root: /home/kat/src
-
-## Element personality
-element_details:
- type: refelt
- name: refelt5
- id: ref5
- instance: Ref5
-
-...
diff --git a/ansible/host_vars/devl4levpro b/ansible/host_vars/dev4lmc
similarity index 52%
rename from ansible/host_vars/devl4levpro
rename to ansible/host_vars/dev4lmc
index 7167e111bdbde3126869c1cd1897da8af928dd81..2d4d21f6495d4ac982beca012e5672625056f95a 100644
--- a/ansible/host_vars/devl4levpro
+++ b/ansible/host_vars/dev4lmc
@@ -1,7 +1,7 @@
-ansible_ssh_host: levpro.devl4.camlab.kat.ac.za
+ansible_ssh_host: lmc.dev4.domain
special_params:
- name: spec1
detail: specdet1
- name: spec2
- detail: specdet2
\ No newline at end of file
+ detail: specdet2
diff --git a/ansible/host_vars/devl5levpro b/ansible/host_vars/devl5levpro
deleted file mode 100644
index a57c56aab191ebcbc068666a7c05b77bf5dd775d..0000000000000000000000000000000000000000
--- a/ansible/host_vars/devl5levpro
+++ /dev/null
@@ -1,7 +0,0 @@
-ansible_ssh_host: levpro.devl5.camlab.kat.ac.za
-
-special_params:
- - name: spec1
- detail: specdet1
- - name: spec2
- detail: specdet2
\ No newline at end of file
diff --git a/ansible/hosts b/ansible/hosts
index 19cf71947b0e6b24cb39b568656642b3c674b4b9..aaa1327fd7964d84a91834c8db7140fe776641ee 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -1,18 +1,9 @@
-
-[devlt]
-monctl.devlt
-
-[devl5]
-devl5levpro
-
-[devl4]
-devl4levpro
+[dev4]
+dev4lmc
[local]
localhost ansible_connection=local
[operational]
-devl4levpro
-devl5levpro
-localhost # assume local is an operational node
-
+dev4lmc
+localhost
diff --git a/ansible/init_refelt.yml b/ansible/init_refelt.yml
deleted file mode 100644
index ab0f5aff9ea81f445678cb7ee8420d6e632c6bd7..0000000000000000000000000000000000000000
--- a/ansible/init_refelt.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# file: init_refelt.yml
-
-- import_playbook: deploy_tangobox.yml
-- import_playbook: deploy_sw.yml
-- import_playbook: generate_sw.yml
-- import_playbook: install_sw.yml
-- import_playbook: register_refelt.yml
diff --git a/ansible/inventories/refelt/config_files/config_starter.json.j2 b/ansible/inventories/refelt/config_files/config_starter.json.j2
index 0f304e0e98c9975d9fd6fc7e16f39da8e8010320..4a405cf32586e7c5d7feaa40b0109877b7b188c8 100644
--- a/ansible/inventories/refelt/config_files/config_starter.json.j2
+++ b/ansible/inventories/refelt/config_files/config_starter.json.j2
@@ -1,7 +1,7 @@
{
"api_version": "v1",
"tango_hosts": {
- "levpro": [
+ "lmc-base-classes": [
{
"startup_level": 1,
"server_instances": ["SKALogger/{{ my_instance }}", "SKALogger/Central"]
diff --git a/ansible/inventories/refelt/config_files/test_vars.json b/ansible/inventories/refelt/config_files/test_vars.json
index df3da9ee6faf90c50f6c4314cc8ad87d47c77760..81f7e02134f72042e287e4d66b9af2dc1d2acaf7 100644
--- a/ansible/inventories/refelt/config_files/test_vars.json
+++ b/ansible/inventories/refelt/config_files/test_vars.json
@@ -1,40 +1,28 @@
{
"queue": {
"first": {
- "car": "bmw",
- "year": "1990",
- "model": "x3",
- "color": "blue"
+ "key1": "value11",
+ "key2": "value21",
+ "key3": "value31",
+ "key4": "value41"
},
"second": {
- "car": "bmw",
- "year": "2000",
- "model": "318",
- "color": "red"
+ "key1": "value12",
+ "key2": "value22",
+ "key3": "value32",
+ "key4": "value42"
},
"3rd": {
- "car": "ref5",
- "year": "2000",
- "model": "ref5",
- "color": "colref5"
- },
- "4th": {
- "car": "ref4",
- "year": "2000",
- "model": "ref4",
- "color": "colref4"
- },
- "5th": {
- "car": "ref",
- "year": "2000",
- "model": "ref",
- "color": "colref"
+ "key1": "value13",
+ "key2": "value23",
+ "key3": "value33",
+ "key4": "value43"
},
"last": {
- "car": "{{ my_id }}",
- "year": "2000",
- "model": "{{ my_name }}",
- "color": "col{{my_id}}"
+ "key1": "{{ my_id }}",
+ "key2": "2000",
+ "key3": "{{ my_name }}",
+ "key4": "col{{my_id}}"
}
}
}
diff --git a/ansible/inventories/refelt4/config_files/config_starter.json.j2 b/ansible/inventories/refelt4/config_files/config_starter.json.j2
index ebc486e3d0c071401f47ccddf0f3b86d759ff5c7..73eb7e9440746e1edccd2db64bdf55d8eb2e1e58 100644
--- a/ansible/inventories/refelt4/config_files/config_starter.json.j2
+++ b/ansible/inventories/refelt4/config_files/config_starter.json.j2
@@ -1,7 +1,7 @@
{
"api_version": "v1",
"tango_hosts": {
- "levpro": [
+ "lmc-base-classes": [
{
"startup_level": 1,
"server_instances": ["SKALogger/{{ my_instance }}", "SKALogger/Central"]
diff --git a/ansible/inventories/refelt4/config_files/test_vars.json b/ansible/inventories/refelt4/config_files/test_vars.json
index df3da9ee6faf90c50f6c4314cc8ad87d47c77760..81f7e02134f72042e287e4d66b9af2dc1d2acaf7 100644
--- a/ansible/inventories/refelt4/config_files/test_vars.json
+++ b/ansible/inventories/refelt4/config_files/test_vars.json
@@ -1,40 +1,28 @@
{
"queue": {
"first": {
- "car": "bmw",
- "year": "1990",
- "model": "x3",
- "color": "blue"
+ "key1": "value11",
+ "key2": "value21",
+ "key3": "value31",
+ "key4": "value41"
},
"second": {
- "car": "bmw",
- "year": "2000",
- "model": "318",
- "color": "red"
+ "key1": "value12",
+ "key2": "value22",
+ "key3": "value32",
+ "key4": "value42"
},
"3rd": {
- "car": "ref5",
- "year": "2000",
- "model": "ref5",
- "color": "colref5"
- },
- "4th": {
- "car": "ref4",
- "year": "2000",
- "model": "ref4",
- "color": "colref4"
- },
- "5th": {
- "car": "ref",
- "year": "2000",
- "model": "ref",
- "color": "colref"
+ "key1": "value13",
+ "key2": "value23",
+ "key3": "value33",
+ "key4": "value43"
},
"last": {
- "car": "{{ my_id }}",
- "year": "2000",
- "model": "{{ my_name }}",
- "color": "col{{my_id}}"
+ "key1": "{{ my_id }}",
+ "key2": "2000",
+ "key3": "{{ my_name }}",
+ "key4": "col{{my_id}}"
}
}
}
diff --git a/ansible/inventories/refelt5/config_files/config_db.json.j2 b/ansible/inventories/refelt5/config_files/config_db.json.j2
deleted file mode 100644
index 450395b9a634ee9c05bfa605bb7e3f79f8d98d6c..0000000000000000000000000000000000000000
--- a/ansible/inventories/refelt5/config_files/config_db.json.j2
+++ /dev/null
@@ -1,402 +0,0 @@
-{
- "api_version": "v1",
- "tango_servers": [
- {
- "server_name": "SvrRefA",
- "server_instances": [
- {
- "instance_name": "1",
- "device_classes": [
- {
- "class_name": "RefA",
- "devices": ["{{ my_id }}/a/1"]
- }
- ]
- },
- {
- "instance_name": "2",
- "device_classes": [
- {
- "class_name": "RefA",
- "devices": ["{{ my_id }}/a/2"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefAchild",
- "server_instances": [
- {
- "instance_name": "11",
- "device_classes": [
- {
- "class_name": "RefAchild",
- "devices": ["{{ my_id }}/achild/11"]
- }
- ]
- },
- {
- "instance_name": "12",
- "device_classes": [
- {
- "class_name": "RefAchild",
- "devices": ["{{ my_id }}/achild/12"]
- }
- ]
- },
- {
- "instance_name": "21",
- "device_classes": [
- {
- "class_name": "RefAchild",
- "devices": ["{{ my_id }}/achild/21"]
- }
- ]
- },
- {
- "instance_name": "22",
- "device_classes": [
- {
- "class_name": "RefAchild",
- "devices": ["{{ my_id }}/achild/22"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefMaster",
- "server_instances": [
- {
- "instance_name": "{{ my_instance }}",
- "device_classes": [
- {
- "class_name": "RefMaster",
- "devices": ["{{ my_id }}/elt/master"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SKALogger",
- "server_instances": [
- {
- "instance_name": "{{ my_instance }}",
- "device_classes": [
- {
- "class_name": "SKALogger",
- "devices": ["{{ my_id }}/elt/logger"]
- }
- ]
- },
- {
- "instance_name": "Central",
- "device_classes": [
- {
- "class_name": "SKALogger",
- "devices": ["central/logger/1"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefAlarmHandler",
- "server_instances": [
- {
- "instance_name": "{{ my_instance }}",
- "device_classes": [
- {
- "class_name": "RefAlarmHandler",
- "devices": ["{{ my_id }}/elt/alarmhandler"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefTelState",
- "server_instances": [
- {
- "instance_name": "{{ my_instance }}",
- "device_classes": [
- {
- "class_name": "RefTelState",
- "devices": ["{{ my_id }}/elt/telstate"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefSubarray",
- "server_instances": [
- {
- "instance_name": "1",
- "device_classes": [
- {
- "class_name": "RefSubarray",
- "devices": ["{{ my_id }}/subarray/1"]
- }
- ]
- },
- {
- "instance_name": "2",
- "device_classes": [
- {
- "class_name": "RefSubarray",
- "devices": ["{{ my_id }}/subarray/2"]
- }
- ]
- },
- {
- "instance_name": "3",
- "device_classes": [
- {
- "class_name": "RefSubarray",
- "devices": ["{{ my_id }}/subarray/3"]
- }
- ]
- },
- {
- "instance_name": "4",
- "device_classes": [
- {
- "class_name": "RefSubarray",
- "devices": ["{{ my_id }}/subarray/4"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefCapability",
- "server_instances": [
- {
- "instance_name": "1A",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub1calca"]
- }
- ]
- },
- {
- "instance_name": "1B",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub1calcb"]
- }
- ]
- },
- {
- "instance_name": "1C",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub1procc"]
- }
- ]
- },
- {
- "instance_name": "1D",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub1procd"]
- }
- ]
- },
- {
- "instance_name": "2A",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub2calca"]
- }
- ]
- },
- {
- "instance_name": "2B",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub2calcb"]
- }
- ]
- },
- {
- "instance_name": "2C",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub2procc"]
- }
- ]
- },
- {
- "instance_name": "2D",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub2procd"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrSimPdu",
- "server_instances": [
- {
- "instance_name": "A",
- "device_classes": [
- {
- "class_name": "PDU",
- "devices": ["{{ my_id }}/pdu/a"]
- },
- {
- "class_name": "PDUSimControl",
- "devices": ["sim_control/pdu/a"]
- }
- ]
- },
- {
- "instance_name": "B",
- "device_classes": [
- {
- "class_name": "PDU",
- "devices": ["{{ my_id }}/pdu/b"]
- },
- {
- "class_name": "PDUSimControl",
- "devices": ["sim_control/pdu/b"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrSimServer",
- "server_instances": [
- {
- "instance_name": "1",
- "device_classes": [
- {
- "class_name": "Server",
- "devices": ["{{ my_id }}/server/1"]
- },
- {
- "class_name": "ServerSimControl",
- "devices": ["sim_control/server/1"]
- }
- ]
- },
- {
- "instance_name": "2",
- "device_classes": [
- {
- "class_name": "Server",
- "devices": ["{{ my_id }}/server/2"]
- },
- {
- "class_name": "ServerSimControl",
- "devices": ["sim_control/server/2"]
- }
- ]
- },
- {
- "instance_name": "3",
- "device_classes": [
- {
- "class_name": "Server",
- "devices": ["{{ my_id }}/server/3"]
- },
- {
- "class_name": "ServerSimControl",
- "devices": ["sim_control/server/3"]
- }
- ]
- },
- {
- "instance_name": "4",
- "device_classes": [
- {
- "class_name": "Server",
- "devices": ["{{ my_id }}/server/4"]
- },
- {
- "class_name": "ServerSimControl",
- "devices": ["sim_control/server/4"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrSimRack",
- "server_instances": [
- {
- "instance_name": "A",
- "device_classes": [
- {
- "class_name": "Rack",
- "devices": ["{{ my_id }}/rack/a"]
- },
- {
- "class_name": "RackSimControl",
- "devices": ["sim_control/rack/a"]
- }
- ]
- },
- {
- "instance_name": "B",
- "device_classes": [
- {
- "class_name": "Rack",
- "devices": ["{{ my_id }}/rack/b"]
- },
- {
- "class_name": "RackSimControl",
- "devices": ["sim_control/rack/b"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrSimSwitch",
- "server_instances": [
- {
- "instance_name": "A",
- "device_classes": [
- {
- "class_name": "Switch",
- "devices": ["{{ my_id }}/switch/a"]
- },
- {
- "class_name": "SwitchSimControl",
- "devices": ["sim_control/switch/a"]
- }
- ]
- },
- {
- "instance_name": "B",
- "device_classes": [
- {
- "class_name": "Switch",
- "devices": ["{{ my_id }}/switch/b"]
- },
- {
- "class_name": "SwitchSimControl",
- "devices": ["sim_control/switch/b"]
- }
- ]
- }
- ]
- }
- ]
-}
diff --git a/ansible/inventories/refelt5/config_files/config_properties.json.j2 b/ansible/inventories/refelt5/config_files/config_properties.json.j2
deleted file mode 100644
index f1d3079a34584d8c1d10d388bbd3037992027cf4..0000000000000000000000000000000000000000
--- a/ansible/inventories/refelt5/config_files/config_properties.json.j2
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "api_version": "v1",
- "global": {
- "Logging": {
- "CentralLoggingTarget": "central/logger/1",
- "ElementLoggingTarget": "{{ my_id }}/elt/logger",
- "StorageLoggingTarget": "/dev/log",
- "CentralLoggingLevelDefault": 2,
- "ElementLoggingLevelDefault": 3,
- "StorageLoggingLevelDefault": 4
- }
- },
- "devices": {
- "{{ my_id }}/a/1": {
- "GroupDefinitions":
- [
- {"group_name": "children",
- "devices": ["{{ my_id }}/achild/11", "{{ my_id }}/achild/12"]}
- ]
- },
- "{{ my_id }}/a/2": {
- "GroupDefinitions":
- [
- {"group_name": "children",
- "devices": ["{{ my_id }}/achild/21", "{{ my_id }}/achild/22"]}
- ]
- },
- "{{ my_id }}/elt/master": {
- "NrSubarrays": 4,
- "CapabilityTypes": ["calca", "calcb", "procc", "procd"],
- "GroupDefinitions":
- [
- {"group_name": "subarrays",
- "devices": ["{{ my_id }}/subarray/1", "{{ my_id }}/subarray/2",
- "{{ my_id }}/subarray/3", "{{ my_id }}/subarray/4"]},
- {"group_name": "servers",
- "devices": ["{{ my_id }}/server/1", "{{ my_id }}/server/2",
- "{{ my_id }}/server/3", "{{ my_id }}/server/4"]},
- {"group_name": "switches",
- "devices": ["{{ my_id }}/switch/a", "{{ my_id }}/switch/b"]},
- {"group_name": "pdus",
- "devices": ["{{ my_id }}/pdu/a", "{{ my_id }}/pdu/b"]},
- {"group_name": "racks",
- "devices": ["{{ my_id }}/rack/a", "{{ my_id }}/rack/b"],
- "subgroups": [
- {"group_name": "rackA",
- "devices": ["{{ my_id }}/server/1", "{{ my_id }}/server/2",
- "{{ my_id }}/switch/a", "{{ my_id }}/pdu/a"]},
- {"group_name": "rackB",
- "devices": ["{{ my_id }}/server/3", "{{ my_id }}/server/4",
- "{{ my_id }}/switch/b", "{{ my_id }}/pdu/b"]}
- ]
- }
- ]
- },
- "{{ my_id }}/subarray/1": {
- "GroupDefinitions":
- [
- {"group_name": "capabilities",
- "devices": ["{{ my_id }}/cap/sub1calca", "{{ my_id }}/cap/sub1calcb",
- "{{ my_id }}/cap/sub1procc", "{{ my_id }}/cap/sub1procd"]}
- ]
- },
- "{{ my_id }}/subarray/2": {
- "GroupDefinitions":
- [
- {"group_name": "capabilities",
- "devices": ["{{ my_id }}/cap/sub2calca", "{{ my_id }}/cap/sub2calcb",
- "{{ my_id }}/cap/sub2procc", "{{ my_id }}/cap/sub2procd"]}
- ]
- },
- "{{ my_id }}/subarray/3": {
- "GroupDefinitions":
- [
- {"group_name": "capabilities",
- "devices": ["{{ my_id }}/cap/sub3calca", "{{ my_id }}/cap/sub3calcb",
- "{{ my_id }}/cap/sub3procc", "{{ my_id }}/cap/sub3procd"]}
- ]
- },
- "{{ my_id }}/subarray/4": {
- "GroupDefinitions":
- [
- {"group_name": "capabilities",
- "devices": ["{{ my_id }}/cap/sub4calca", "{{ my_id }}/cap/sub4calcb",
- "{{ my_id }}/cap/sub4procc", "{{ my_id }}/cap/sub4procd"]}
- ]
- },
- "{{ my_id }}/elt/logger": {
- "Config": []
- },
- "{{ my_id }}/elt/telstate": {
- "TelStateConfigFile": []
- },
- "{{ my_id }}/elt/alarmhandler": {
- "Config": []
- },
- "central/logger/1": {
- "Config": []
- }
- }
-}
diff --git a/ansible/inventories/refelt5/config_files/config_starter.json.j2 b/ansible/inventories/refelt5/config_files/config_starter.json.j2
deleted file mode 100644
index 62837d4b529aa30fcd6c23784426f2a03aafcbb2..0000000000000000000000000000000000000000
--- a/ansible/inventories/refelt5/config_files/config_starter.json.j2
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "api_version": "v1",
- "tango_hosts": {
- "levpro": [
- {
- "startup_level": 1,
- "server_instances": ["SKALogger/{{ my_instance }}", "SKALogger/Central"]
- },
- {
- "startup_level": 2,
- "server_instances": ["SvrRefAchild/11", "SvrRefAchild/12",
- "SvrRefAchild/21", "SvrRefAchild/22",
- "SvrRefCapability/1A", "SvrRefCapability/1B",
- "SvrRefCapability/1C", "SvrRefCapability/1D",
- "SvrRefCapability/2A", "SvrRefCapability/2B",
- "SvrRefCapability/2C", "SvrRefCapability/2D",
- "SvrSimPdu/A", "SvrSimPdu/B",
- "SvrSimServer/1", "SvrSimServer/2",
- "SvrSimServer/3", "SvrSimServer/4",
- "SvrSimRack/A", "SvrSimRack/B",
- "SvrSimSwitch/A", "SvrSimSwitch/B"]
- },
- {
- "startup_level": 3,
- "server_instances": ["SvrRefA/1", "SvrRefA/2",
- "SvrRefCapabilityA/1", "SvrRefCapabilityA/2",
- "SvrRefCapabilityA/3", "SvrRefCapabilityA/4"]
- },
- {
- "startup_level": 4,
- "server_instances": ["SvrRefSubarray/1", "SvrRefSubarray/2",
- "SvrRefSubarray/3", "SvrRefSubarray/4"]
- },
- {
- "startup_level": 5,
- "server_instances": ["SvrRefMaster/{{ my_instance }}",
- "SvrRefAlarmHandler/{{ my_instance }}",
- "SvrRefTelState/{{ my_instance }}"]
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/ansible/inventories/refelt5/config_files/test_vars.json b/ansible/inventories/refelt5/config_files/test_vars.json
deleted file mode 100644
index df3da9ee6faf90c50f6c4314cc8ad87d47c77760..0000000000000000000000000000000000000000
--- a/ansible/inventories/refelt5/config_files/test_vars.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "queue": {
- "first": {
- "car": "bmw",
- "year": "1990",
- "model": "x3",
- "color": "blue"
- },
- "second": {
- "car": "bmw",
- "year": "2000",
- "model": "318",
- "color": "red"
- },
- "3rd": {
- "car": "ref5",
- "year": "2000",
- "model": "ref5",
- "color": "colref5"
- },
- "4th": {
- "car": "ref4",
- "year": "2000",
- "model": "ref4",
- "color": "colref4"
- },
- "5th": {
- "car": "ref",
- "year": "2000",
- "model": "ref",
- "color": "colref"
- },
- "last": {
- "car": "{{ my_id }}",
- "year": "2000",
- "model": "{{ my_name }}",
- "color": "col{{my_id}}"
- }
- }
-}
diff --git a/ansible/inventories/refelt_template/refelt_config_db.json.j2 b/ansible/inventories/refelt_template/refelt_config_db.json.j2
deleted file mode 100644
index c67d40a2e926a26bf17c1673037c41d4000b10a1..0000000000000000000000000000000000000000
--- a/ansible/inventories/refelt_template/refelt_config_db.json.j2
+++ /dev/null
@@ -1,360 +0,0 @@
-{
- "api_version": "v1",
- "tango_servers": [
- {
- "server_name": "SvrRefA",
- "server_instances": [
- {
- "instance_name": "1",
- "device_classes": [
- {
- "class_name": "RefA",
- "devices": ["{{ my_id }}/a/1"]
- }
- ]
- },
- {
- "instance_name": "2",
- "device_classes": [
- {
- "class_name": "RefA",
- "devices": ["{{ my_id }}/a/2"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefAchild",
- "server_instances": [
- {
- "instance_name": "1",
- "device_classes": [
- {
- "class_name": "RefAchild",
- "devices": ["{{ my_id }}/achild/11", "{{ my_id }}/achild/12"]
- }
- ]
- },
- {
- "instance_name": "2",
- "device_classes": [
- {
- "class_name": "RefAchild",
- "devices": ["{{ my_id }}/achild/21", "{{ my_id }}/achild/22"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefMaster",
- "server_instances": [
- {
- "instance_name": "{{ my_instance }}",
- "device_classes": [
- {
- "class_name": "RefMaster",
- "devices": ["{{ my_id }}/elt/master"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SKALogger",
- "server_instances": [
- {
- "instance_name": "{{ my_instance }}",
- "device_classes": [
- {
- "class_name": "SKALogger",
- "devices": ["{{ my_id }}/elt/logger"]
- }
- ]
- },
- {
- "instance_name": "Central",
- "device_classes": [
- {
- "class_name": "SKALogger",
- "devices": ["central/logger/1"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefAlarmHandler",
- "server_instances": [
- {
- "instance_name": "{{ my_instance }}",
- "device_classes": [
- {
- "class_name": "RefAlarmHandler",
- "devices": ["{{ my_id }}/elt/alarmhandler"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefTelState",
- "server_instances": [
- {
- "instance_name": "{{ my_instance }}",
- "device_classes": [
- {
- "class_name": "RefTelState",
- "devices": ["{{ my_id }}/elt/telstate"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefSubarray",
- "server_instances": [
- {
- "instance_name": "1",
- "device_classes": [
- {
- "class_name": "RefSubarray",
- "devices": ["{{ my_id }}/subarray/1"]
- }
- ]
- },
- {
- "instance_name": "2",
- "device_classes": [
- {
- "class_name": "RefSubarray",
- "devices": ["{{ my_id }}/subarray/2"]
- }
- ]
- },
- {
- "instance_name": "3",
- "device_classes": [
- {
- "class_name": "RefSubarray",
- "devices": ["{{ my_id }}/subarray/3"]
- }
- ]
- },
- {
- "instance_name": "4",
- "device_classes": [
- {
- "class_name": "RefSubarray",
- "devices": ["{{ my_id }}/subarray/4"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrRefCapability",
- "server_instances": [
- {
- "instance_name": "1",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub1calca",
- "{{ my_id }}/cap/sub1calcb",
- "{{ my_id }}/cap/sub1procc",
- "{{ my_id }}/cap/sub1procd"]
- }
- ]
- },
- {
- "instance_name": "2",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub2calca",
- "{{ my_id }}/cap/sub2calcb",
- "{{ my_id }}/cap/sub2procc",
- "{{ my_id }}/cap/sub2procd"]
- }
- ]
- },
- {
- "instance_name": "3",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub3calca",
- "{{ my_id }}/cap/sub3calcb",
- "{{ my_id }}/cap/sub3procc",
- "{{ my_id }}/cap/sub3procd"]
- }
- ]
- },
- {
- "instance_name": "4",
- "device_classes": [
- {
- "class_name": "RefCapability",
- "devices": ["{{ my_id }}/cap/sub4calca",
- "{{ my_id }}/cap/sub4calcb",
- "{{ my_id }}/cap/sub4procc",
- "{{ my_id }}/cap/sub4procd"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrSimPdu",
- "server_instances": [
- {
- "instance_name": "A",
- "device_classes": [
- {
- "class_name": "PDU",
- "devices": ["{{ my_id }}/pdu/a"]
- },
- {
- "class_name": "PDUSimControl",
- "devices": ["sim_control/pdu/a"]
- }
- ]
- },
- {
- "instance_name": "B",
- "device_classes": [
- {
- "class_name": "PDU",
- "devices": ["{{ my_id }}/pdu/b"]
- },
- {
- "class_name": "PDUSimControl",
- "devices": ["sim_control/pdu/b"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrSimServer",
- "server_instances": [
- {
- "instance_name": "1",
- "device_classes": [
- {
- "class_name": "Server",
- "devices": ["{{ my_id }}/server/1"]
- },
- {
- "class_name": "ServerSimControl",
- "devices": ["sim_control/server/1"]
- }
- ]
- },
- {
- "instance_name": "2",
- "device_classes": [
- {
- "class_name": "Server",
- "devices": ["{{ my_id }}/server/2"]
- },
- {
- "class_name": "ServerSimControl",
- "devices": ["sim_control/server/2"]
- }
- ]
- },
- {
- "instance_name": "3",
- "device_classes": [
- {
- "class_name": "Server",
- "devices": ["{{ my_id }}/server/3"]
- },
- {
- "class_name": "ServerSimControl",
- "devices": ["sim_control/server/3"]
- }
- ]
- },
- {
- "instance_name": "4",
- "device_classes": [
- {
- "class_name": "Server",
- "devices": ["{{ my_id }}/server/4"]
- },
- {
- "class_name": "ServerSimControl",
- "devices": ["sim_control/server/4"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrSimRack",
- "server_instances": [
- {
- "instance_name": "A",
- "device_classes": [
- {
- "class_name": "Rack",
- "devices": ["{{ my_id }}/rack/a"]
- },
- {
- "class_name": "RackSimControl",
- "devices": ["sim_control/rack/a"]
- }
- ]
- },
- {
- "instance_name": "B",
- "device_classes": [
- {
- "class_name": "Rack",
- "devices": ["{{ my_id }}/rack/b"]
- },
- {
- "class_name": "RackSimControl",
- "devices": ["sim_control/rack/b"]
- }
- ]
- }
- ]
- },
- {
- "server_name": "SvrSimSwitch",
- "server_instances": [
- {
- "instance_name": "A",
- "device_classes": [
- {
- "class_name": "Switch",
- "devices": ["{{ my_id }}/switch/a"]
- },
- {
- "class_name": "SwitchSimControl",
- "devices": ["sim_control/switch/a"]
- }
- ]
- },
- {
- "instance_name": "B",
- "device_classes": [
- {
- "class_name": "Switch",
- "devices": ["{{ my_id }}/switch/b"]
- },
- {
- "class_name": "SwitchSimControl",
- "devices": ["sim_control/switch/b"]
- }
- ]
- }
- ]
- }
- ]
-}
diff --git a/ansible/inventories/refelt_template/refelt_config_starter.json.j2 b/ansible/inventories/refelt_template/refelt_config_starter.json.j2
deleted file mode 100644
index 9b921a57f31d414bd87b643c73d741ae041b044c..0000000000000000000000000000000000000000
--- a/ansible/inventories/refelt_template/refelt_config_starter.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "api_version": "v1",
- "tango_hosts": {
- "levpro": [
- {
- "startup_level": 1,
- "server_instances": ["SKALogger/{{ my_instance }}", "SKALogger/Central"]
- },
- {
- "startup_level": 2,
- "server_instances": ["SvrSimPdu/A", "SvrSimPdu/B",
- "SvrSimServer/1", "SvrSimServer/2",
- "SvrSimServer/3", "SvrSimServer/4",
- "SvrSimRack/A", "SvrSimRack/B",
- "SvrSimSwitch/A", "SvrSimSwitch/B"]
- },
- {
- "startup_level": 3,
- "server_instances": ["SvrRefAchild/11", "SvrRefAchildA/12",
- "SvrRefAchild/21", "SvrRefAchildA/22",
- "SvrRefCapability/1", "SvrRefCapability/2",
- "SvrRefCapability/3", "SvrRefCapability/4"]
- },
- {
- "startup_level": 4,
- "server_instances": ["SvrRefA/1", "SvrRefA/2",
- "SvrRefSubarray/1", "SvrRefSubarray/2",
- "SvrRefSubarray/3", "SvrRefSubarray/4"]
- },
- {
- "startup_level": 5,
- "server_instances": ["SvrRefMaster/{{ my_instance }}", "SvrRefAlarmHandler/{{ my_instance }}", "SvrRefTelState/{{ my_instance }}"]
- }
- ]
- }
-}
diff --git a/ansible/inventories/refelt_template/refelt_device_properties.json.j2 b/ansible/inventories/refelt_template/refelt_device_properties.json.j2
deleted file mode 100644
index 8aa87accc141e6812dbc85e8b1c8032dd3072971..0000000000000000000000000000000000000000
--- a/ansible/inventories/refelt_template/refelt_device_properties.json.j2
+++ /dev/null
@@ -1,129 +0,0 @@
-{
- "api_version": "v1",
- "global": {
- "CentralLoggingTarget": "central/logger/1",
- "ElementLoggingTarget": "{{ my_id }}/elt/logger",
- "StorageLoggingTarget": "/dev/log",
- "CentralLoggingLevelDefault": 2,
- "ElementLoggingLevelDefault": 3,
- "StorageLoggingLevelDefault": 3
- },
- "devices": {
- "{{ my_id }}/a/1": {
- "GroupDefinitions":
- [
- {"group_name": "children",
- "devices": ["{{ my_id }}/achild/11", "{{ my_id }}/achild/12"]}
- ]
- },
- "{{ my_id }}/a/2": {
- "GroupDefinitions":
- [
- {"group_name": "children",
- "devices": ["{{ my_id }}/achild/21", "{{ my_id }}/achild/22"]}
- ]
- },
- "{{ my_id }}/elt/master": {
- "NrSubarrays": 4,
- "CapabilityTypes": ["calca", "calcb", "procc", "procd"],
- "GroupDefinitions":
- [
- {"group_name": "subarrays",
- "devices": ["{{ my_id }}/subarray/1", "{{ my_id }}/subarray/2",
- "{{ my_id }}/subarray/3", "{{ my_id }}/subarray/4"]},
- {"group_name": "servers",
- "devices": ["{{ my_id }}/server/1", "{{ my_id }}/server/2",
- "{{ my_id }}/server/3", "{{ my_id }}/server/4"]},
- {"group_name": "switches",
- "devices": ["{{ my_id }}/switch/a", "{{ my_id }}/switch/b"]},
- {"group_name": "pdus",
- "devices": ["{{ my_id }}/pdu/a", "{{ my_id }}/pdu/b"]},
- {"group_name": "racks",
- "devices": ["{{ my_id }}/rack/a", "{{ my_id }}/rack/b"],
- "subgroups": [
- {"group_name": "rackA",
- "devices": ["{{ my_id }}/server/1", "{{ my_id }}/server/2",
- "{{ my_id }}/switch/a", "{{ my_id }}/pdu/a"]},
- {"group_name": "rackB",
- "devices": ["{{ my_id }}/server/3", "{{ my_id }}/server/4",
- "{{ my_id }}/switch/b", "{{ my_id }}/pdu/b"]}
- ]
- }
- ]
- },
- "{{ my_id }}/subarray/1": {
- "GroupDefinitions":
- [
- {"group_name": "capabilities",
- "devices": ["{{ my_id }}/cap/sub1calca", "{{ my_id }}/cap/sub1calcb",
- "{{ my_id }}/cap/sub1procc", "{{ my_id }}/cap/sub1procd"]}
- ]
- },
- "{{ my_id }}/subarray/2": {
- "GroupDefinitions":
- [
- {"group_name": "capabilities",
- "devices": ["{{ my_id }}/cap/sub2calca", "{{ my_id }}/cap/sub2calcb",
- "{{ my_id }}/cap/sub2procc", "{{ my_id }}/cap/sub2procd"]}
- ]
- },
- "{{ my_id }}/subarray/3": {
- "GroupDefinitions":
- [
- {"group_name": "capabilities",
- "devices": ["{{ my_id }}/cap/sub3calca", "{{ my_id }}/cap/sub3calcb",
- "{{ my_id }}/cap/sub3procc", "{{ my_id }}/cap/sub3procd"]}
- ]
- },
- "{{ my_id }}/subarray/4": {
- "GroupDefinitions":
- [
- {"group_name": "capabilities",
- "devices": ["{{ my_id }}/cap/sub4calca", "{{ my_id }}/cap/sub4calcb",
- "{{ my_id }}/cap/sub4procc", "{{ my_id }}/cap/sub4procd"]}
- ]
- },
- "{{ my_id }}/elt/logger": {
- "Config": []
- },
- "{{ my_id }}/elt/telstate": {
- "TelStateConfigFile": []
- },
- "{{ my_id }}/elt/alarmhandler": {
- "Config": []
- },
- "sim_control/pdu/A": {
- "model_key": "{{ my_id }}/pdu/a"
- },
- "sim_control/pdu/B": {
- "model_key": "{{ my_id }}/pdu/b"
- },
- "sim_control/server/1": {
- "model_key": "{{ my_id }}/server/1"
- },
- "sim_control/server/2": {
- "model_key": "{{ my_id }}/server/2"
- },
- "sim_control/server/3": {
- "model_key": "{{ my_id }}/server/3"
- },
- "sim_control/server/4": {
- "model_key": "{{ my_id }}/server/4"
- },
- "sim_control/rack/A": {
- "model_key": "{{ my_id }}/rack/a"
- },
- "sim_control/rack/B": {
- "model_key": "{{ my_id }}/rack/b"
- },
- "sim_control/switch/A": {
- "model_key": "{{ my_id }}/switch/a"
- },
- "sim_control/switch/B": {
- "model_key": "{{ my_id }}/switch/b"
- },
- "central/logger/1": {
- "Config": []
- }
- }
-}
diff --git a/ansible/inventories/refelt_template/test_vars.json b/ansible/inventories/refelt_template/test_vars.json
deleted file mode 100644
index df3da9ee6faf90c50f6c4314cc8ad87d47c77760..0000000000000000000000000000000000000000
--- a/ansible/inventories/refelt_template/test_vars.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "queue": {
- "first": {
- "car": "bmw",
- "year": "1990",
- "model": "x3",
- "color": "blue"
- },
- "second": {
- "car": "bmw",
- "year": "2000",
- "model": "318",
- "color": "red"
- },
- "3rd": {
- "car": "ref5",
- "year": "2000",
- "model": "ref5",
- "color": "colref5"
- },
- "4th": {
- "car": "ref4",
- "year": "2000",
- "model": "ref4",
- "color": "colref4"
- },
- "5th": {
- "car": "ref",
- "year": "2000",
- "model": "ref",
- "color": "colref"
- },
- "last": {
- "car": "{{ my_id }}",
- "year": "2000",
- "model": "{{ my_name }}",
- "color": "col{{my_id}}"
- }
- }
-}
diff --git a/ansible/library/register_refelt.py b/ansible/library/register_refelt.py
deleted file mode 100644
index ebf55ee626a81b035c2cceb4ace348c58c97c173..0000000000000000000000000000000000000000
--- a/ansible/library/register_refelt.py
+++ /dev/null
@@ -1,263 +0,0 @@
-#!/usr/bin/env python
-
-##################################################
-### DEBUG USING:
-### ansible-playbook -i hosts site.yml --limit local --tags register-refelt-in-tangodb -vvv
-### ansible-playbook -i hosts site.yml --limit local --tags register-refelt-in-astor -vvv
-### USE IT LIKE THIS:
-### ./play-task.sh register-refelt in-tangodb
-### ./play-task.sh register-refelt in-astor
-##################################################
-
-
-##################################################
-### MODULE IMPORT
-##################################################
-# Put any initial imports here - we can't use module.fail_json b/c we haven't
-# imported stuff from ansible.module_utils.basic yet
-# import configure_devices
-
-#try:
-# ## STANDARD MODULES
-# import json
-# import pkg_resources
-# import PyTango
-
-#except ImportError, e:
-# print "failed=True msg='failed to import python module: %s'" % e
-# sys.exit(1)
-##################################################
-import json
-import pkg_resources
-import PyTango
-import logging
-from fandango import Astor
-
-
-DEFAULT_REFELT_ASTOR_CONFIG = dict(
-#node: {level: (server/instance,server/instance,...)}
- { "levpro": {
- 0: ("TangoAccessControl/1",),
- 1: ("SvrFileLogger/Central",),
- 2: ("SvrFileLogger/Elt",),
- 3: ("SvrRefAchild/1",
- "SvrRefAchild/2",
- "SvrRefCapability/Sub1CapCalcA",
- "SvrRefCapability/Sub1CapCalcB",
- "SvrRefCapability/Sub1CapProcC",
- "SvrRefCapability/Sub1CapProcD",
- "SvrRefCapability/Sub2CapCalcA",
- "SvrRefCapability/Sub2CapCalcB",
- "SvrRefCapability/Sub2CapProcC",
- "SvrRefCapability/Sub2CapProcD",),
- 4: ("SvrRefA/1",
- "SvrRefA/2",
- "SvrRefSubarray/Sub1",
- "SvrRefSubarray/Sub2",
- "SvrAlarmHandler/SubElt1",
- "SvrAlarmHandler/SubElt2",),
- 5: ("SvrRefMaster/Elt",
- "SvrAlarmHandler/Elt",
- "SvrTelState/Elt"),
- },
- })
-
-DEFAULT_REFELT_TANGO_CONFIG = dict(
-#server_exe: {server_instance: ((device_class,domain/family/instance),...)}
- { "SvrFileLogger" : {
- # TBD - decide where to configure central devices like logger and archiver
- "Central": (("FileLogger", "ref/central/logger"),),
- "Elt": (("FileLogger", "ref/elt/logger"),),
- },
- "SvrRefA" : {
- "1": (("RefA", "ref/a/1"),),
- "2": (("RefA", "ref/a/2"),),
- },
- "SvrRefAchild" : {
- "1": (("RefAchild", "ref/achild/11"),
- ("RefAchild", "ref/achild/12"),),
- "2": (("RefAchild", "ref/achild/21"),
- ("RefAchild", "ref/achild/22"),),
- },
- "SvrRefMaster" : {
- "Elt": (("RefMaster","ref/elt/master"),),
- },
- "SvrRefTelState" : {
- "Elt": (("RefTelState","ref/elt/telstate"),),
- },
- "SvrRefAlarmHandler" : {
- "Elt": (("RefAlarmHandler","ref/elt/alarmhandler"),),
- "SubElt1": (("RefAlarmHandler","ref/subelt1/alarmhandler"),),
- "SubElt2": (("RefAlarmHandler","ref/subelt2/alarmhandler"),),
- },
- "SvrRefSubarray" : {
- "Sub1": (("RefSubarray", "ref/subarray/1"),),
- "Sub2": (("RefSubarray", "ref/subarray/2"),),
- },
- "SvrRefCapability" : {
- "Sub1CapCalcA": (("RefCapability", "ref/cap/sub1_calca"),),
- "Sub1CapCalcB": (("RefCapability", "ref/cap/sub1_calcb"),),
- "Sub1CapProcC": (("RefCapability", "ref/cap/sub1_procc"),),
- "Sub1CapProcD": (("RefCapability", "ref/cap/sub1_procd"),),
- # or
- #"Sub1CapA": (("RefCapability", "ref/subarray1/calca"),),
- #"Sub1CapB": (("RefCapability", "ref/subarray1/calcb"),),
- #"Sub1CapC": (("RefCapability", "ref/subarray1/procc"),),
- #"Sub1CapD": (("RefCapability", "ref/subarray1/procd"),),
- #or
- #"Sub1CapA": (("RefCapability", "ref/calca/sub1"),),
- #"Sub1CapB": (("RefCapability", "ref/calca/sub2"),),
- #"Sub1CapC": (("RefCapability", "ref/calcb/sub1"),),
- #"Sub1CapD": (("RefCapability", "ref/calcb/sub2"),),
- #or
- "Sub2CapCalcA": (("RefCapability", "ref/cap/sub2_calca"),),
- "Sub2CapCalcB": (("RefCapability", "ref/cap/sub2_calcb"),),
- "Sub2CapProcC": (("RefCapability", "ref/cap/sub2_procc"),),
- "Sub2CapProcD": (("RefCapability", "ref/cap/sub2_procd"),),
- },
- })
-
-
-def register_device(db, name, device_class, server_class, server_instance):
- dev_info = PyTango.DbDevInfo()
- dev_info.name = name
- dev_info._class = device_class
- dev_info.server = "{}/{}".format(server_class.split('.')[0], server_instance)
- print """Attempting to register TANGO device {!r} class: {!r} server: {!r}.""".format(
- dev_info.name, dev_info._class, dev_info.server)
- db.add_device(dev_info)
-
-
-def register_in_tango(name, dbconfig):
- errors = 0
- done = 0
- db = PyTango.Database()
- out = ""
- #server_class: {server_instance: (class,domain/family/instance),...)}
- for server_class in sorted(dbconfig.keys()):
- for server_instance in dbconfig[server_class].keys():
- devices = dbconfig[server_class][server_instance]
- for device_class, device_name in devices:
- try:
- register_device(db, device_name, device_class, server_class, server_instance)
- logging.info("Registered {}".format(device_name))
- done += 1
- out = out + " " + device_name
- except Exception as exc:
- logging.error("FAILED to register {} {}".format(device_name, exc))
- print """FAILED TO REGISTER in TANGO db"""
- print """server_class={!r} server_instance={!r} device_class={!r} device_name={!r}.""".format(
- server_class, server_instance, device_class, device_name)
- errors += 1
- continue
- return errors, done, out
-
-
-def register_in_astor(name, astorconfig):
- errors = 0
- done = 0
- out = ""
-
- #node: {level: (server/instance,server/instance,...)}
- astor = Astor()
- for node in sorted(astorconfig.keys()):
- astor.load_by_host(node)
- for level in sorted(astorconfig[node].keys()):
- server_instances = astorconfig[node][level]
- for server_instance in server_instances:
- try:
- astor.set_server_level(server_instance, node, level)
- logging.info("Registered {}".format(server_instance))
- done += 1
- out += " " + server_instance
- # For now - start each server - else they do not show up in the Astor GUI
- # Start them independently since they do not all exist in DsPath yet
- try:
- result = astor.start_servers([server_instance], node)
- if not result:
- logging.error("FAILED to start {!r}".format(server_instance))
- print """FAILED TO START in ASTOR"""
- print """node={!r} level={!r} server_instance={!r}.""".format(
- node, level, server_instance)
- out += "(not started)"
- except Exception as exc:
- logging.error("EXCEPTION in start {!r} ({!r})".format(server_instance, exc))
- print """EXCEPTION IN START in ASTOR"""
- print """node={!r} level={!r} server_instance={!r}.""".format(
- node, level, server_instance)
- out += "(exception in start)"
- # Do not count this as an error for now
- except Exception as exc:
- logging.error("EXCEPTION in register {!r} ({!r})".format(server_instance, exc))
- print """EXCEPTION IN REGISTER in ASTOR"""
- print """node={!r} level={!r} server_instance={!r}.""".format(
- node, level, server_instance)
- errors += 1
- out += "(exception in register)"
- continue
- return errors, done, out
-
-##################################################
-### MODULE MAIN
-##################################################
-def main():
- """Main for the Ansible module"""
-
- ## Create ansible module
- changed = False
- message = ''
-
- module = AnsibleModule(
- argument_spec=dict(action=dict(required=True),
- facility_name=dict(required=True),
- facility_config=dict(required=True)),
- supports_check_mode=True
- )
-
- # In check mode, we take no action
- # Since this module never changes system state, we just
- # return changed=False
- if module.check_mode:
- module.exit_json(changed=False)
-
- ## Check if required parameters are provided
- # action, facility_name, facility_config
- if not module.params.get('action'):
- msg = "action parameter has to be specified!"
- module.fail_json(msg=msg)
-
- if not module.params.get('facility_name'):
- msg = "facility_name parameter has to be specified!"
- module.fail_json(msg=msg)
-
- if not module.params.get('facility_config'):
- msg = "facility_config parameter has to be specified!"
- module.fail_json(msg=msg)
-
- ## Get and check module args
- action = module.params['action']
- facility_name = module.params['facility_name']
- facility_config = module.params['facility_config']
-
- if action == "in_tangodb":
- if facility_config == "TBD":
- facility_config = DEFAULT_REFELT_TANGO_CONFIG
- errors, done, out = register_in_tango(facility_name, facility_config)
- msg = "Failed to register devices in TANGO db"
- elif action == "in_astor":
- if facility_config == "TBD":
- facility_config = DEFAULT_REFELT_ASTOR_CONFIG
- msg = "Failed to register servers in ASTOR"
- errors, done, out = register_in_astor(facility_name, facility_config)
-
- if errors:
- module.fail_json(msg=msg)
- else:
- module.exit_json(msg="Success {} done ({})".format(done, out),changed=True)
-
-
-## Include at the end ansible (NB: it is not a standard Python include according to manual)
-from ansible.module_utils.basic import *
-
-if __name__ == '__main__':
- main()
diff --git a/ansible/register_refelt.yml b/ansible/register_refelt.yml
deleted file mode 100644
index 371c80bc1fcaa3ba4ade78daeb68bb9ab80ba67e..0000000000000000000000000000000000000000
--- a/ansible/register_refelt.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-- name: register_refelt
- hosts: operational
- roles:
- - {role: 'register_refelt', tags: ['register-refelt']}
-
-
diff --git a/ansible/roles/deploy_sw/README.md b/ansible/roles/deploy_sw/README.md
index 1b0f22a333e3a8940dc21fc2dbe231784961e18f..59906681757c42a3b57955fb7c1e34e17428506d 100644
--- a/ansible/roles/deploy_sw/README.md
+++ b/ansible/roles/deploy_sw/README.md
@@ -1,3 +1,3 @@
deploy_sw
---------
-This role deploys software packages for RefElt - levpro
+This role deploys (i.e. git clones or pulls) the software repo for lmc-base-classes.
diff --git a/ansible/roles/deploy_sw/tasks/main.yml b/ansible/roles/deploy_sw/tasks/main.yml
index 97c28c98df55e51e600016f875a8594c2ab1eff5..fb5dc5a54be41830ddacc901420a6d59f0dd79a3 100644
--- a/ansible/roles/deploy_sw/tasks/main.yml
+++ b/ansible/roles/deploy_sw/tasks/main.yml
@@ -11,24 +11,24 @@
## Clone repos
###########################################
-## levpro
+## lmc-base-classes
-- name: Check for levpro in software_root
- stat: path={{software_root}}/levpro
- register: p_levpro
+- name: Check for lmc-base-classes in software_root
+ stat: path={{software_root}}/lmc-base-classes
+ register: p_lmc_base_classes
tags:
- - deploy-sw-levpro
+ - deploy-sw-lmc-base-classes
-- name: Clone levpro if dir not existing
- command: git clone https://github.com/ska-sa/levpro {{software_root}}/levpro
- when: not p_levpro.stat.exists
+- name: Clone lmc-base-classes if dir not existing
+ command: git clone https://github.com/ska-telescope/lmc-base-classes {{software_root}}/lmc-base-classes
+ when: not p_lmc_base_classes.stat.exists
tags:
- - deploy-sw-levpro
+ - deploy-sw-lmc-base-classes
-- name: Git pull levpro if dir exists
- command: git -C {{software_root}}/levpro pull
- when: p_levpro.stat.isdir is defined and p_levpro.stat.isdir
+- name: Git pull lmc-base-classes if dir exists
+ command: git -C {{software_root}}/lmc-base-classes pull
+ when: p_lmc_base_classes.stat.isdir is defined and p_lmc_base_classes.stat.isdir
tags:
- - deploy-sw-levpro
+ - deploy-sw-lmc-base-classes
...
diff --git a/ansible/roles/deploy_tangobox/config_files/tango_config_starter.json b/ansible/roles/deploy_tangobox/config_files/tango_config_starter.json
index d42d8d2f0b31dab7bdfacafc823fd8dfddfdb396..9ef86d22ebd50aa1effb6d0365369631e1851c1c 100644
--- a/ansible/roles/deploy_tangobox/config_files/tango_config_starter.json
+++ b/ansible/roles/deploy_tangobox/config_files/tango_config_starter.json
@@ -1,7 +1,7 @@
{
"api_version": "v1",
"tango_hosts": {
- "levpro": [
+ "lmc-base-classes": [
{
"startup_level": 4,
"server_instances": ["TangoRestServer/rest"]
diff --git a/ansible/roles/generate_sw/tasks/main.yml b/ansible/roles/generate_sw/tasks/main.yml
index b649627dfcb9f7deb0251f8473dd1ed1ae225f4e..c8f2c95cdd442823af8befe1aa36975aba519863 100644
--- a/ansible/roles/generate_sw/tasks/main.yml
+++ b/ansible/roles/generate_sw/tasks/main.yml
@@ -16,7 +16,7 @@
- name: Generate skabase
command: pogo -src {{item}}.xmi
args:
- chdir: "{{software_root}}/levpro/skabase/{{item}}"
+ chdir: "{{software_root}}/lmc-base-classes/skabase/{{item}}"
environment:
DISPLAY: "localhost:1.0"
with_items:
@@ -35,7 +35,7 @@
- name: Generate refelt
command: pogo -src {{item}}.xmi
args:
- chdir: "{{software_root}}/levpro/refelt/refelt"
+ chdir: "{{software_root}}/lmc-base-classes/refelt/refelt"
environment:
DISPLAY: "localhost:1.0"
with_items:
@@ -60,7 +60,7 @@
become: yes
command: >
tango-simlib-generator
- --sim-data-file {{software_root}}/levpro/refelt/refelt/{{item}}.xmi
+ --sim-data-file {{software_root}}/lmc-base-classes/refelt/refelt/{{item}}.xmi
--dserver-name SvrSim{{item}}
--directory /usr/local/bin/
with_items:
diff --git a/ansible/roles/install_sw/tasks/main.yml b/ansible/roles/install_sw/tasks/main.yml
index e818c50aa2d390b09b120b75b8e7fcf5d93c0542..577e30e3dfe60c6c1fdeb734b0ea11b24e68315e 100644
--- a/ansible/roles/install_sw/tasks/main.yml
+++ b/ansible/roles/install_sw/tasks/main.yml
@@ -13,44 +13,44 @@
###########################################
- block:
- - name: Install levpro
- #command: sudo pip install {{software_root}}/levpro -U --no-deps
+ - name: Install lmc-base-classes
+ #command: sudo pip install {{software_root}}/lmc-base-classes -U --no-deps
pip:
name: "{{software_root}}/{{item}}"
extra_args: -U --no-deps
with_items:
- - levpro
+ - lmc-base-classes
become: True
tags:
- - install-sw-levpro
+ - install-sw-lmc-base-classes
- block:
- name: Install skabase
- #command: sudo pip install {{software_root}}/levpro/skabase/{{item}} -U --no-deps
+ #command: sudo pip install {{software_root}}/lmc-base-classes/skabase/{{item}} -U --no-deps
pip:
name: "{{software_root}}/{{item}}"
extra_args: -U --no-deps
with_items:
- - levpro/skabase/SKABaseDevice
- - levpro/skabase/SKAObsDevice
- - levpro/skabase/SKAMaster
- - levpro/skabase/SKASubarray
- - levpro/skabase/SKACapability
- - levpro/skabase/SKAAlarmHandler
- - levpro/skabase/SKATelState
- - levpro/skabase/SKALogger
+ - lmc-base-classes/skabase/SKABaseDevice
+ - lmc-base-classes/skabase/SKAObsDevice
+ - lmc-base-classes/skabase/SKAMaster
+ - lmc-base-classes/skabase/SKASubarray
+ - lmc-base-classes/skabase/SKACapability
+ - lmc-base-classes/skabase/SKAAlarmHandler
+ - lmc-base-classes/skabase/SKATelState
+ - lmc-base-classes/skabase/SKALogger
become: True
tags:
- install-sw-skabase
- block:
- name: Install refelt
- #command: sudo pip install {{software_root}}/levpro/refelt -U --no-deps
+ #command: sudo pip install {{software_root}}/lmc-base-classes/refelt -U --no-deps
pip:
name: "{{software_root}}/{{item}}"
extra_args: -U --no-deps
with_items:
- - levpro/refelt
+ - lmc-base-classes/refelt
become: True
tags:
- install-sw-refelt
diff --git a/ansible/roles/refresh_sw/tasks/main.yml b/ansible/roles/refresh_sw/tasks/main.yml
index 2821b9be5200ab5fed4c23dee5fd6d9488ffc6d4..78df7e100aed4480536098e3fff217acd7714eea 100644
--- a/ansible/roles/refresh_sw/tasks/main.yml
+++ b/ansible/roles/refresh_sw/tasks/main.yml
@@ -13,9 +13,9 @@
# Do we want to pull on refresh_sw ???
-- name: Refresh levpro
- command: git -C {{software_root}}/levpro pull
+- name: Refresh lmc-base-classes
+ command: git -C {{software_root}}/lmc-base-classes pull
tags:
- - refresh-sw-levpro
+ - refresh-sw-lmc-base-classes
...
diff --git a/ansible/roles/register_my_refelt/tasks/main.yml b/ansible/roles/register_my_refelt/tasks/main.yml
index 9e0ac4a81a634e78b4a51882d8d092f938dbcda4..137a6272ef7699fe57915f4ba5652643fec7a849 100644
--- a/ansible/roles/register_my_refelt/tasks/main.yml
+++ b/ansible/roles/register_my_refelt/tasks/main.yml
@@ -69,7 +69,7 @@
# else ansible template processing replaces the double quotes with single qoutes
# breaking the json
# https://stackoverflow.com/questions/41144922/ansible-passing-json-string-in-environment-to-shell-module
- var_config_db: " {{ lookup('template', '{{ software_root }}/levpro/ansible/inventories/{{ my_name }}/config_files/config_db.json.j2') | to_json }}"
+ var_config_db: " {{ lookup('template', '{{ software_root }}/lmc-base-classes/ansible/inventories/{{ my_name }}/config_files/config_db.json.j2') | to_json }}"
register_element:
config_json: "{{ var_config_db }}"
register: the_result
@@ -77,7 +77,7 @@
- name: Register MyRefElt device properties in TANGO db
vars:
# NOTE - the space before the double open curly brackets " {{..." is required - see above
- var_config_properties: " {{ lookup('template', '{{ software_root}}/levpro/ansible/inventories/{{my_name}}/config_files/config_properties.json.j2') | to_json }}"
+ var_config_properties: " {{ lookup('template', '{{ software_root}}/lmc-base-classes/ansible/inventories/{{my_name}}/config_files/config_properties.json.j2') | to_json }}"
register_properties:
properties_json: "{{ var_config_properties }}"
register: the_result
@@ -101,7 +101,7 @@
- name: Register MyRefElt in Astor and restart with Starter
vars:
# NOTE - the space before the double open curly brackets " {{..." is required - see above
- var_config_starter: " {{ lookup('template', '{{ software_root }}/levpro/ansible/inventories/{{ my_name }}/config_files/config_starter.json.j2') | to_json }}"
+ var_config_starter: " {{ lookup('template', '{{ software_root }}/lmc-base-classes/ansible/inventories/{{ my_name }}/config_files/config_starter.json.j2') | to_json }}"
start_element:
starter_json: "{{ var_config_starter }}"
register: the_result
diff --git a/ansible/roles/register_refelt/tasks/main.yml b/ansible/roles/register_refelt/tasks/main.yml
deleted file mode 100644
index 361d5e2cd95f1569c54b81e36f74b654a023a137..0000000000000000000000000000000000000000
--- a/ansible/roles/register_refelt/tasks/main.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-#
-#
-# !!!!!!!! DEPRECATED - use register_my_refelt !!!!!!!!!!!
-#
-#
-
-# THIS IS SPECIFIC FOR REFELT - JUST TO GET A REFELT REGISTERED
-# GENERALISATION OF CONFIG AND FOR OTHER ELEMENTS IS TBD
-
-###########################################
-## PRINT STUFF
-###########################################
-
-- name: Print software_root directory
- debug: msg="rootdir = {{software_root}}"
-
-
-###########################################
-## Register in TANGO db
-###########################################
-
-- block:
- - name: Register RefElt servers, classes, devices
- register_element:
- elt_config_file: "{{software_root}}/levpro/ansible/inventories/refelt/config_files/config_db.json"
- register: the_result
- - name: Register RefElt properties
- register_properties:
- elt_config_file: "{{software_root}}/levpro/ansible/inventories/refelt/config_files/device_properties.json"
- register: the_result
- tags:
- - register-refelt-in-tangodb
-
-###########################################
-### Register in ASTOR
-############################################
-- block:
- - name: Set StartDsPath
- set_starter_ds_path:
- facility_name="refelt"
- facility_config="TBD"
- starter_path="/usr/local/bin/"
- register: the_result
- tags:
- - register-refelt-in-astor
- - register-refelt-in-astor-ds-path
-
-
-- block:
- - name: Register RefElt in Astor and restart with Starter
- start_element:
- element_config: "{{software_root}}/levpro/ansible/inventories/refelt/config_files/config_starter.json"
- register: the_result
- tags:
- - register-refelt-in-astor
-...
diff --git a/ansible/site.yml b/ansible/site.yml
index b553feae7744af90af688275afa86d24121f66ec..8795261a05f2e23071a9f6235b8e84f48c608cf9 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -6,7 +6,6 @@
- import_playbook: generate_sw.yml
- import_playbook: install_sw.yml
- import_playbook: refresh_sw.yml
-- import_playbook: register_refelt.yml
- import_playbook: register_my_refelt.yml
# Additional helper playbooks
diff --git a/ansible/test_vars.yml b/ansible/test_vars.yml
index f079ba287e6bc6df3084f97a563de6435c197a76..71e8da56194b4ec84b33adc4c32e1109089965ed 100644
--- a/ansible/test_vars.yml
+++ b/ansible/test_vars.yml
@@ -9,12 +9,12 @@
my_id: "{{ hostvars[inventory_hostname].element_details.id }}"
my_instance: "{{ hostvars[inventory_hostname].element_details.instance }}"
testVars: "{{ lookup('file', './inventories/{{ my_name }}/config_files/test_vars.json') | from_json }}"
- configDbFile: "{{ lookup('file', './inventories/{{ my_name }}/config_files/config_db.json') | from_json }}"
- configDbJson: "{{ lookup('template', './inventories/{{ my_name }}/config_files/config_db.json') }}"
- configPropertiesFile: "{{ lookup('file', './inventories/{{ my_name }}/config_files/config_properties.json') | from_json }}"
- configPropertiesJson: "{{ lookup('template', './inventories/{{ my_name }}/config_files/config_properties.json') }}"
- configStarterFile: "{{ lookup('file', './inventories/{{ my_name }}/config_files/config_starter.json') | from_json }}"
- configStarterJson: "{{ lookup('template', './inventories/{{ my_name }}/config_files/config_starter.json') }}"
+ configDbFile: "{{ lookup('file', './inventories/{{ my_name }}/config_files/config_db.json.j2') | from_json }}"
+ configDbJson: "{{ lookup('template', './inventories/{{ my_name }}/config_files/config_db.json.j2') }}"
+ configPropertiesFile: "{{ lookup('file', './inventories/{{ my_name }}/config_files/config_properties.json.j2') | from_json }}"
+ configPropertiesJson: "{{ lookup('template', './inventories/{{ my_name }}/config_files/config_properties.json.j2') }}"
+ configStarterFile: "{{ lookup('file', './inventories/{{ my_name }}/config_files/config_starter.json.j2') | from_json }}"
+ configStarterJson: "{{ lookup('template', './inventories/{{ my_name }}/config_files/config_starter.json.j2') }}"
tasks:
- name: Print my hostvars
@@ -66,17 +66,17 @@
tags:
- prints
- - name: testVars find blue cars
+ - name: testVars find key2 22
with_dict: "{{ testVars['queue'] }}"
shell: |
- if echo "{{ item.value.color }}" | grep -q "blue" ; then
- echo "SUCCESS - found blue at {{ item.key }}"
+ if echo "{{ item.value.key2 }}" | grep -q "22" ; then
+ echo "SUCCESS - found 22 at {{ item.key }}"
fi
- name: testVars find my id
with_dict: "{{ testVars['queue'] }}"
shell: |
- if echo "{{ item.value.car }}" | grep -q "{{ my_id }}" ; then
+ if echo "{{ item.value.key1 }}" | grep -q "{{ my_id }}" ; then
echo "SUCCESS - found {{ my_id }} at {{ item.key }}"
fi
diff --git a/docker/README.md b/docker/README.md
index cac7fa07ef3e17fa7551b97a3b85f02eaa9a2e6e..636a111b3324153a9fb7e3dd9877f4eafc434263 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,12 +1,12 @@
-# levpro-test (with ubuntu 14.04)
+# lmc-base-classes-test (with ubuntu 14.04)
-[Docker](http://www.docker.com) image configuration for testing [levpro](https://github.com/ska-sa/levpro).
+[Docker](http://www.docker.com) image configuration for testing [lmc-base-classes](https://github.com/ska-telescope/lmc-base-classes).
-It is based on a [Ubuntu](https://www.ubuntu.com/) 14.04 (trusty) and it provides the following infrastructure for installing and testing levpro:
+It is based on a [Ubuntu](https://www.ubuntu.com/) 14.04 (trusty) and it provides the following infrastructure for installing and testing lmc-base-classes:
- xvfb, for headless GUI testing
-- levpro dependencies and recommended packages (PyTango, pytest, tango-simlib, Fandango, ...)
-- A Tango DB and TangoTest DS configured and running for testing levpro
+- lmc-base-classes dependencies and recommended packages (PyTango, pytest, tango-simlib, Fandango, ...)
+- A Tango DB and TangoTest DS configured and running for testing lmc-base-classes
The primary use of this Docker image is to use it in our Continuous Integration workflow.
But you may also run it on your own machine.
@@ -14,31 +14,31 @@ But you may also run it on your own machine.
First build the image:
~~~~
-docker build . -t tango-levpro
+docker build . -t tango-lmc-base-classes
~~~~
Start up the tango container:
~~~~
-docker run --rm --name levpro -it tango-levpro:latest
+docker run --rm --name lmc-base-classes -it tango-lmc-base-classes:latest
~~~~
-or start with levpro project (/home/user/src/levpro) mounted in container for development
+or start with lmc-base-classes project (/home/user/src/lmc-base-classes) mounted in container for development
~~~~
-docker run --rm --name levpro -v /home/user/src/levpro:/home/tango-cs/src/levpro -it tango-levpro:latest
+docker run --rm --name lmc-base-classes -v /home/user/src/lmc-base-classes:/home/tango-cs/src/lmc-base-classes -it tango-lmc-base-classes:latest
~~~~
or if you want TANGO DB available outside the container, export the port
~~~~
-docker run --rm --name levpro -v /home/user/src/levpro:/home/tango-cs/src/levpro -p 10123:10000 -it tango-levpro:latest
+docker run --rm --name lmc-base-classes -v /home/user/src/lmc-base-classes:/home/tango-cs/src/lmc-base-classes -p 10123:10000 -it tango-lmc-base-classes:latest
~~~~
Then you can log into the container with:
~~~~
-docker exec -it levpro bash
+docker exec -it lmc-base-classes bash
~~~~
Connecting to the TANGO DB using jive
@@ -47,6 +47,6 @@ Connecting to the TANGO DB using jive
env TANGO_HOST=localhost:10123 jive
~~~~
-Note: This image does not contain levpro itself (since it is designed for installing development versions of levpro) but you can
-install it easily **from your container** (for more details, see [LEvPro Deployment Notes](
+Note: This image does not contain lmc-base-classes itself (since it is designed for installing development versions of lmc-base-classes) but you can
+install it easily **from your container** (for more details, see old [LEvPro Deployment Notes](
https://docs.google.com/document/d/12f495FEMOi0g3bJjoZL3icZaCCr7iSjTY3jToFqA2Ns/edit#heading=h.tzfrhvg9rcoo)).
diff --git a/refelt/refelt/Pdu.xmi b/refelt/refelt/Pdu.xmi
index c28c51cf618128e42fd3df4d680a370877b99f03..e46181dd20403d91920a483101b885f2c602753f 100644
--- a/refelt/refelt/Pdu.xmi
+++ b/refelt/refelt/Pdu.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="PDU" pogoRevision="9.6">
- <description description="Ref (Reference Elt) PDU device" title="PDU" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Elt) PDU device" title="PDU" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/Rack.xmi b/refelt/refelt/Rack.xmi
index f03eab3b7d632f08748820f1ef0c3984a5f0061f..0c3935c3f10ae1fb6333c913fed22a7d3f74bfa2 100644
--- a/refelt/refelt/Rack.xmi
+++ b/refelt/refelt/Rack.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="Rack" pogoRevision="9.6">
- <description description="Ref (Reference Elt) Rack device" title="Rack" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files" license="none" copyright="" hasMandatoryProperty="true" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Elt) Rack device" title="Rack" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files" license="none" copyright="" hasMandatoryProperty="true" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefA.xmi b/refelt/refelt/RefA.xmi
index 2a9fdb9a9990f42783d511cc19396a0b62c86447..72633179d7b7c5639e3307087d93e747fa91eaed 100644
--- a/refelt/refelt/RefA.xmi
+++ b/refelt/refelt/RefA.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="RefA" pogoRevision="9.6">
- <description description="An Ref (Reference Elt) device of type A" title="RefA" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="An Ref (Reference Elt) device of type A" title="RefA" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefAchild.xmi b/refelt/refelt/RefAchild.xmi
index 44bce2b9271c756ab61c68ac476d7b9ddcf1cdb7..aba280553f303dd1aca46fa7b4b1013464577457 100644
--- a/refelt/refelt/RefAchild.xmi
+++ b/refelt/refelt/RefAchild.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="RefAchild" pogoRevision="9.6">
- <description description="Ref (Reference Element) device of type Achild" title="RefAchild" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Element) device of type Achild" title="RefAchild" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefAlarmHandler.xmi b/refelt/refelt/RefAlarmHandler.xmi
index b423482c1712871531ce3b58e22df4941037be1e..cb4d4f47f0ba6b708f36f14ec6203838fa5fb70a 100644
--- a/refelt/refelt/RefAlarmHandler.xmi
+++ b/refelt/refelt/RefAlarmHandler.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="RefAlarmHandler" pogoRevision="9.6">
- <description description="Ref (Reference Element) device of Type AlarmHandler" title="RefAlarmHandler" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Element) device of Type AlarmHandler" title="RefAlarmHandler" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKAAlarmHandler" sourcePath="../../skabase/SKAAlarmHandler"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA"/>
diff --git a/refelt/refelt/RefB.xmi b/refelt/refelt/RefB.xmi
index 61f447d69caa0c90548747666cc7c6b23d41ec9e..05a00d1bad6f5e4806ffd6cd3e7bff517979e58b 100644
--- a/refelt/refelt/RefB.xmi
+++ b/refelt/refelt/RefB.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="RefB" pogoRevision="9.6">
- <description description="Ref (Reference Element) device of type B." title="RefB" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Element) device of type B." title="RefB" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefBchild.xmi b/refelt/refelt/RefBchild.xmi
index 3dfd7e1d7ef1d5616e91da934ebbad8a34403f02..941e2f774eaed8c4f83c1a3f8cfdc6c9d592b13d 100644
--- a/refelt/refelt/RefBchild.xmi
+++ b/refelt/refelt/RefBchild.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="RefBchild" pogoRevision="9.6">
- <description description=" Ref (Reference Element) device of type Bchild." title="RefBchild" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description=" Ref (Reference Element) device of type Bchild." title="RefBchild" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefCapabilityA.xmi b/refelt/refelt/RefCapabilityA.xmi
index 7cb16b3a3a6a262b8d828c91eeb92b2a705f05ed..1c39f18fdf9933f1aa2442cb0f07790a30bb9971 100644
--- a/refelt/refelt/RefCapabilityA.xmi
+++ b/refelt/refelt/RefCapabilityA.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="RefCapabilityA" pogoRevision="9.6">
- <description description="Ref (Reference Element) device of Type Capability A" title="RefCapabilityA" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files,Protected Regions" license="none" copyright="" hasMandatoryProperty="true" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Element) device of Type Capability A" title="RefCapabilityA" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files,Protected Regions" license="none" copyright="" hasMandatoryProperty="true" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKAObsDevice" sourcePath="../../skabase/SKAObsDevice"/>
<inheritances classname="SKACapability" sourcePath="../../skabase/SKACapability"/>
diff --git a/refelt/refelt/RefMaster.xmi b/refelt/refelt/RefMaster.xmi
index aab27845889e3cf9d6dda314e549f72fbe835088..8f7f537e86b58d7ff302e7d1c3d4258bc62a853a 100644
--- a/refelt/refelt/RefMaster.xmi
+++ b/refelt/refelt/RefMaster.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="RefMaster" pogoRevision="9.6">
- <description description="Ref (Reference Element) device of Type Master" title="RefMaster" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Element) device of Type Master" title="RefMaster" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKAMaster" sourcePath="../../skabase/SKAMaster"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefSubarray.xmi b/refelt/refelt/RefSubarray.xmi
index 5f64d6b2594348944d24794b87a9a8853c323576..b9ba01567812db8b2cf8369252f7be4bc8f2a00c 100644
--- a/refelt/refelt/RefSubarray.xmi
+++ b/refelt/refelt/RefSubarray.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="RefSubarray" pogoRevision="9.6">
- <description description="Ref (Reference Element) device of Type Subarray" title="RefSubarray" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Element) device of Type Subarray" title="RefSubarray" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKASubarray" sourcePath="../../skabase/SKASubarray"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefTelState.xmi b/refelt/refelt/RefTelState.xmi
index 744fc919bc06c2beba153a8994eb1c3c2c376456..0c1a39a9d26aa944407de405717d8da58c3cf2cb 100644
--- a/refelt/refelt/RefTelState.xmi
+++ b/refelt/refelt/RefTelState.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="RefTelState" pogoRevision="9.6">
- <description description="Ref (Reference Element) device of Type TelState" title="RefTelState" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Element) device of Type TelState" title="RefTelState" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKATelState" sourcePath="../../skabase/SKATelState"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA"/>
diff --git a/refelt/refelt/Server.xmi b/refelt/refelt/Server.xmi
index 967155f788c67730d5dc8660fb9532cdcd0c3312..e331cad4bfa5b4028ffd7f21292dacc614677fbd 100644
--- a/refelt/refelt/Server.xmi
+++ b/refelt/refelt/Server.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="Server" pogoRevision="9.6">
- <description description="Ref (Reference Elt) Server device" title="Server" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Elt) Server device" title="Server" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/Switch.xmi b/refelt/refelt/Switch.xmi
index 181555f48d94e05e4a7a604840c520eecca3eac8..78e61571d1b7121db8a2250ea94c16bb02d648f9 100644
--- a/refelt/refelt/Switch.xmi
+++ b/refelt/refelt/Switch.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="Switch" pogoRevision="9.6">
- <description description="Ref (Reference Elt) Swtich device" title="Switch" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="Ref (Reference Elt) Swtich device" title="Switch" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/release.py b/refelt/release.py
index cd955f36f8af3b72bbfb2de58ea7bdedb5d8286a..a9a657001e63853ba8b48a7eb4cdd61b9e064774 100644
--- a/refelt/release.py
+++ b/refelt/release.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# This file is part of the levpro/refelt project
+# This file is part of the lmc-base-classes/refelt project
#
#
#
diff --git a/refelt/setup.py b/refelt/setup.py
index 82ba570dc8d70163e04dbbd02ce13428b9ea22dd..90ba3a6078abeaa1ef4305ce3d36419fd280cb87 100644
--- a/refelt/setup.py
+++ b/refelt/setup.py
@@ -25,8 +25,7 @@ exec(open(release_filename).read())
setup(name=name,
version=version,
description='An SKA Refence Element (Ref)',
- author="MeerKAT CAM Team",
- author_email="cam at ska.ac.za",
+ author="SKA Team",
packages=find_packages(), #pack
include_package_data=True,
entry_points={'console_scripts':[
@@ -48,7 +47,7 @@ setup(name=name,
'SvrRefCapabilityC = refelt.RefCapabilityC:main',
'SvrRefCapabilityD = refelt.RefCapabilityD:main',
]},
- url='http://ska.ac.za/',
+ url='https://www.skatelescope.org/',
classifiers=[
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
diff --git a/sandbox/refelt_config_starter.json b/sandbox/refelt_config_starter.json
index 8bcba2a513700911ec5dfc6d904aff304fa5c71f..c98b147f4c2ecb9ebfee55cea8b5af1f6ef5293f 100644
--- a/sandbox/refelt_config_starter.json
+++ b/sandbox/refelt_config_starter.json
@@ -1,7 +1,7 @@
{
"api_version": "v1",
"tango_hosts": {
- "levpro": [
+ "lmc-base-classes": [
{
"startup_level": 1,
"server_instances": ["FileLogger/elt", "FileLogger/central"]
diff --git a/scripts/purge_xmi_tree.py b/scripts/purge_xmi_tree.py
old mode 100644
new mode 100755
diff --git a/setup.py b/setup.py
index 3ae3035ed907efa0f48172fa64675753fdeac787..c782eb94835b6eede4711f6ebe8c6d339a2401e5 100644
--- a/setup.py
+++ b/setup.py
@@ -8,17 +8,16 @@ from setuptools import setup, find_packages
needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
pytest_runner = ['pytest-runner'] if needs_pytest else []
-setup(name="levpro",
+setup(name="lmc_base_classes",
description="Element Base Classes - Evolutionary Prototype",
- author="MeerKAT CAM Team",
- author_email="cam@ska.ac.za",
+ author="SKA Team",
packages=find_packages(),
include_package_data=True,
scripts=["scripts/gen_csv_info.py",
"scripts/purge_xmi_tree.py",
"scripts/elt_ctl.py",
],
- url='http://ska.ac.za/',
+ url='https://www.skatelescope.org/',
classifiers=[
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
@@ -39,5 +38,5 @@ setup(name="levpro",
"pytest-cov",
"pytest-xdist"
],
- keywords="levpro lmc ska",
+ keywords="lmc base classes ska",
zip_safe=False)
diff --git a/skabase/SKAAlarmHandler/SKAAlarmHandler.xmi b/skabase/SKAAlarmHandler/SKAAlarmHandler.xmi
index e255008185ac1ac3e8d3a8be63a67b217915929b..d8ca2c3103171a8d876c4ab9446b8d59052d480c 100644
--- a/skabase/SKAAlarmHandler/SKAAlarmHandler.xmi
+++ b/skabase/SKAAlarmHandler/SKAAlarmHandler.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="SKAAlarmHandler" pogoRevision="9.6">
- <description description="A generic base device for Alarms for SKA." title="SKAAlarmHandler" sourcePath="/home/pogo/src/levpro/skabase/SKAAlarmHandler" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="A generic base device for Alarms for SKA." title="SKAAlarmHandler" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKAAlarmHandler" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAAlarmHandler"/>
diff --git a/skabase/SKABaseDevice/SKABaseDevice.xmi b/skabase/SKABaseDevice/SKABaseDevice.xmi
index 85e68d5b379c923665c813a0d6bfd1c1dd813ed2..185f85713f04b816d11f82faf43ce2833b03b5c4 100644
--- a/skabase/SKABaseDevice/SKABaseDevice.xmi
+++ b/skabase/SKABaseDevice/SKABaseDevice.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="SKABaseDevice" pogoRevision="9.6">
- <description description="A generic base device for SKA." title="SKABASE" sourcePath="/home/pogo/src/levpro/skabase/SKABaseDevice" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="A generic base device for SKA." title="SKABASE" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKABaseDevice" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKABaseDevice"/>
</description>
diff --git a/skabase/SKACapability/SKACapability.xmi b/skabase/SKACapability/SKACapability.xmi
index 6698d812e0c3b6944b262e9884e8204f7d452e01..196ff8405d71d1354e0f24991a6452d8f882c596 100644
--- a/skabase/SKACapability/SKACapability.xmi
+++ b/skabase/SKACapability/SKACapability.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="SKACapability" pogoRevision="9.6">
- <description description="Subarray handling device" title="SKACapability" sourcePath="/home/pogo/src/levpro/skabase/SKACapability" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="true" hasAbstractAttribute="false">
+ <description description="Subarray handling device" title="SKACapability" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKACapability" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="true" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKAObsDevice" sourcePath="../SKAObsDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="SkaBase" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="none" reference=""/>
diff --git a/skabase/SKALogger/SKALogger.xmi b/skabase/SKALogger/SKALogger.xmi
index 92a73f9192676544b1cfb23f086e53523947affe..58a35957582a2d05ae88ec1406a32ef7dd8c5f9e 100644
--- a/skabase/SKALogger/SKALogger.xmi
+++ b/skabase/SKALogger/SKALogger.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="SKALogger" pogoRevision="9.6">
- <description description="A generic base device for Logging for SKA." title="SKALogger" sourcePath="/home/pogo/src/levpro/skabase/SKALogger" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="A generic base device for Logging for SKA." title="SKALogger" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKALogger" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKALogger"/>
diff --git a/skabase/SKAMaster/SKAMaster.xmi b/skabase/SKAMaster/SKAMaster.xmi
index 50f95bef7ce1a1f7d6dbd7becb0e55b3940327b2..f14469c8cbd37a392f8c8352a69d79ecc15d8323 100644
--- a/skabase/SKAMaster/SKAMaster.xmi
+++ b/skabase/SKAMaster/SKAMaster.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="SKAMaster" pogoRevision="9.6">
- <description description="A master test" title="SKAMaster" sourcePath="/home/pogo/src/levpro/skabase/SKAMaster" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="A master test" title="SKAMaster" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKAMaster" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="SkaBase" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="none" reference=""/>
diff --git a/skabase/SKAObsDevice/SKAObsDevice.xmi b/skabase/SKAObsDevice/SKAObsDevice.xmi
index 37085f06237979c2edcb70ee681491193b2352ef..1427ce11c70434e75da01f10cc1684cdc78d26e7 100644
--- a/skabase/SKAObsDevice/SKAObsDevice.xmi
+++ b/skabase/SKAObsDevice/SKAObsDevice.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="SKAObsDevice" pogoRevision="9.6">
- <description description="A generic base device for Observations for SKA." title="SKAObsDevice" sourcePath="/home/pogo/src/levpro/skabase/SKAObsDevice" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="true" hasAbstractAttribute="false">
+ <description description="A generic base device for Observations for SKA." title="SKAObsDevice" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKAObsDevice" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="true" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/skabase/SKASubarray/SKASubarray.xmi b/skabase/SKASubarray/SKASubarray.xmi
index af928c78bcb1e61e7806026962b32b165111a6af..1acfc0da8d16fd60dc830724b7e223a0d2e0ff62 100644
--- a/skabase/SKASubarray/SKASubarray.xmi
+++ b/skabase/SKASubarray/SKASubarray.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="SKASubarray" pogoRevision="9.6">
- <description description="SubArray handling device" title="SKASubarray" sourcePath="/home/pogo/src/levpro/skabase/SKASubarray" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="SubArray handling device" title="SKASubarray" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKASubarray" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKAObsDevice" sourcePath="../SKAObsDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="SkaBase" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="none" reference=""/>
diff --git a/skabase/SKATelState/SKATelState.xmi b/skabase/SKATelState/SKATelState.xmi
index bf213de29899a774ba3800e013e0945eeac73250..8c49ebf27ec2bbe6eb0fe7bb952788d9e55c97a3 100644
--- a/skabase/SKATelState/SKATelState.xmi
+++ b/skabase/SKATelState/SKATelState.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="SKATelState" pogoRevision="9.6">
- <description description="A generic base device for Telescope State for SKA." title="SKATelState" sourcePath="/home/pogo/src/levpro/skabase/SKATelState" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="A generic base device for Telescope State for SKA." title="SKATelState" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKATelState" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKATelState"/>
diff --git a/skabase/SKATestDevice/SKATestDevice.xmi b/skabase/SKATestDevice/SKATestDevice.xmi
index 7e55f83f2b92764247a2fbd0404d8e187f5edb45..9fa7055e2537df1a0457df9a4847d2abbf810dc6 100644
--- a/skabase/SKATestDevice/SKATestDevice.xmi
+++ b/skabase/SKATestDevice/SKATestDevice.xmi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="SKATestDevice" pogoRevision="9.6">
- <description description="A generic Test device for testing SKA base class functionalites." title="SKATestDevice" sourcePath="/home/pogo/src/levpro/skabase/SKATestDevice" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="A generic Test device for testing SKA base class functionalites." title="SKATestDevice" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKATestDevice" language="PythonHL" filestogenerate="XMI file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
<identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKATestDevice"/>