From c7b133279dd2f14b467ae85c437f469d7bd9f0b8 Mon Sep 17 00:00:00 2001
From: Thomas Juerges <4-jurges@users.noreply.git.astron.nl>
Date: Thu, 30 Apr 2020 17:02:53 +0200
Subject: [PATCH] Renamed CrossEcho -> Femto-DS, RandomDataDev -> RandomData-DS
---
.../Crossecho.py => Femto-DS/Femto-DS.py | 0
Femto-DS/Femto-DS.sh | 15 +++++++++++++++
.../Crossecho.xmi => Femto-DS/Femto-DS.xmi | 4 ++--
{crossechoTangoDev => Femto-DS}/LICENSE.txt | 0
{crossechoTangoDev => Femto-DS}/MANIFEST.in | 0
{crossechoTangoDev => Femto-DS}/README.rst | 0
{crossechoTangoDev => Femto-DS}/requirements.txt | 0
{crossechoTangoDev => Femto-DS}/setup.py | 0
.../test/Crossecho_test.py | 0
{crossechoTangoDev => Femto-DS}/test/__init__.py | 0
.../RandomData-DS.py | 0
RandomData-DS/RandomData-DS.sh | 15 +++++++++++++++
.../RandomData-DS.xmi | 2 +-
RandomDataDev/RandomData.sh | 10 ----------
crossechoTangoDev/Crossecho.sh | 10 ----------
15 files changed, 33 insertions(+), 23 deletions(-)
rename crossechoTangoDev/Crossecho.py => Femto-DS/Femto-DS.py (100%)
create mode 100755 Femto-DS/Femto-DS.sh
rename crossechoTangoDev/Crossecho.xmi => Femto-DS/Femto-DS.xmi (94%)
rename {crossechoTangoDev => Femto-DS}/LICENSE.txt (100%)
rename {crossechoTangoDev => Femto-DS}/MANIFEST.in (100%)
rename {crossechoTangoDev => Femto-DS}/README.rst (100%)
rename {crossechoTangoDev => Femto-DS}/requirements.txt (100%)
rename {crossechoTangoDev => Femto-DS}/setup.py (100%)
rename {crossechoTangoDev => Femto-DS}/test/Crossecho_test.py (100%)
rename {crossechoTangoDev => Femto-DS}/test/__init__.py (100%)
rename RandomDataDev/RandomData.py => RandomData-DS/RandomData-DS.py (100%)
create mode 100755 RandomData-DS/RandomData-DS.sh
rename RandomDataDev/RandomData.xmi => RandomData-DS/RandomData-DS.xmi (99%)
delete mode 100755 RandomDataDev/RandomData.sh
delete mode 100755 crossechoTangoDev/Crossecho.sh
diff --git a/crossechoTangoDev/Crossecho.py b/Femto-DS/Femto-DS.py
similarity index 100%
rename from crossechoTangoDev/Crossecho.py
rename to Femto-DS/Femto-DS.py
diff --git a/Femto-DS/Femto-DS.sh b/Femto-DS/Femto-DS.sh
new file mode 100755
index 000000000..5f55a620f
--- /dev/null
+++ b/Femto-DS/Femto-DS.sh
@@ -0,0 +1,15 @@
+runThis=$(basename ${0})
+runThis=${runThis//.sh/.py}
+if [ -f ${runThis} ]; then
+ myDir=${PWD}
+else
+ myDir=${PWD}/$(dirname ${0})
+fi
+
+if [ ${#} -eq 1 ]; then
+ instance="${1}"
+else
+ echo "The instance of this device server must be provided!"
+fi
+containerPath=${myDir//${HOME}\//\/hosthome\/}
+docker exec -it itango python3 ${containerPath}/${runThis} ${instance}
diff --git a/crossechoTangoDev/Crossecho.xmi b/Femto-DS/Femto-DS.xmi
similarity index 94%
rename from crossechoTangoDev/Crossecho.xmi
rename to Femto-DS/Femto-DS.xmi
index 44fd7a21d..ed53d8fed 100644
--- a/crossechoTangoDev/Crossecho.xmi
+++ b/Femto-DS/Femto-DS.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="Crossecho" pogoRevision="9.6">
- <description description="Implementation of a Tango device on top of an existing OPC-UA server in Python3." title="LOFAR2.0 Station Software" sourcePath="/hosthome/workspace.astron/git/tango/crossechoTangoDev" language="PythonHL" filestogenerate="XMI file,Code files,Protected Regions" license="APACHE" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <classes name="Femto" pogoRevision="9.6">
+ <description description="Implementation of a Tango device on top of an existing OPC-UA server in Python3." title="LOFAR2.0 Station Software" sourcePath="/hosthome/workspace.astron/git/tango/Femto-DS" language="PythonHL" filestogenerate="XMI file,Code files,Protected Regions" license="APACHE" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<identification contact="at astron.nl - jurges" author="jurges" emailDomain="astron.nl" classFamily="OtherInstruments" siteSpecific="" platform="Unix Like" bus="Not Applicable" manufacturer="none" reference=""/>
</description>
diff --git a/crossechoTangoDev/LICENSE.txt b/Femto-DS/LICENSE.txt
similarity index 100%
rename from crossechoTangoDev/LICENSE.txt
rename to Femto-DS/LICENSE.txt
diff --git a/crossechoTangoDev/MANIFEST.in b/Femto-DS/MANIFEST.in
similarity index 100%
rename from crossechoTangoDev/MANIFEST.in
rename to Femto-DS/MANIFEST.in
diff --git a/crossechoTangoDev/README.rst b/Femto-DS/README.rst
similarity index 100%
rename from crossechoTangoDev/README.rst
rename to Femto-DS/README.rst
diff --git a/crossechoTangoDev/requirements.txt b/Femto-DS/requirements.txt
similarity index 100%
rename from crossechoTangoDev/requirements.txt
rename to Femto-DS/requirements.txt
diff --git a/crossechoTangoDev/setup.py b/Femto-DS/setup.py
similarity index 100%
rename from crossechoTangoDev/setup.py
rename to Femto-DS/setup.py
diff --git a/crossechoTangoDev/test/Crossecho_test.py b/Femto-DS/test/Crossecho_test.py
similarity index 100%
rename from crossechoTangoDev/test/Crossecho_test.py
rename to Femto-DS/test/Crossecho_test.py
diff --git a/crossechoTangoDev/test/__init__.py b/Femto-DS/test/__init__.py
similarity index 100%
rename from crossechoTangoDev/test/__init__.py
rename to Femto-DS/test/__init__.py
diff --git a/RandomDataDev/RandomData.py b/RandomData-DS/RandomData-DS.py
similarity index 100%
rename from RandomDataDev/RandomData.py
rename to RandomData-DS/RandomData-DS.py
diff --git a/RandomData-DS/RandomData-DS.sh b/RandomData-DS/RandomData-DS.sh
new file mode 100755
index 000000000..5f55a620f
--- /dev/null
+++ b/RandomData-DS/RandomData-DS.sh
@@ -0,0 +1,15 @@
+runThis=$(basename ${0})
+runThis=${runThis//.sh/.py}
+if [ -f ${runThis} ]; then
+ myDir=${PWD}
+else
+ myDir=${PWD}/$(dirname ${0})
+fi
+
+if [ ${#} -eq 1 ]; then
+ instance="${1}"
+else
+ echo "The instance of this device server must be provided!"
+fi
+containerPath=${myDir//${HOME}\//\/hosthome\/}
+docker exec -it itango python3 ${containerPath}/${runThis} ${instance}
diff --git a/RandomDataDev/RandomData.xmi b/RandomData-DS/RandomData-DS.xmi
similarity index 99%
rename from RandomDataDev/RandomData.xmi
rename to RandomData-DS/RandomData-DS.xmi
index 67f1f09e9..99d123b20 100644
--- a/RandomDataDev/RandomData.xmi
+++ b/RandomData-DS/RandomData-DS.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="RandomData" pogoRevision="9.6">
- <description description="" title="Random data monitor point device" sourcePath="/hosthome/workspace.astron/git/tango/RandomDataDev" language="PythonHL" filestogenerate="XMI file,Code files,Protected Regions" license="APACHE" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+ <description description="" title="Random data monitor point device" sourcePath="/hosthome/workspace.astron/git/tango/RandomData-DS" language="PythonHL" filestogenerate="XMI file,Code files,Protected Regions" license="APACHE" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<identification contact="at astron.nl - jurges" author="jurges" emailDomain="astron.nl" classFamily="Simulators" siteSpecific="" platform="Unix Like" bus="Not Applicable" manufacturer="ASTRON" reference=""/>
</description>
diff --git a/RandomDataDev/RandomData.sh b/RandomDataDev/RandomData.sh
deleted file mode 100755
index be0211299..000000000
--- a/RandomDataDev/RandomData.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-runThis=$(basename ${0})
-runThis=${runThis//.sh/.py}
-if [ -f ${runThis} ]; then
- myDir=${PWD}
-else
- myDir=${PWD}/$(dirname ${0})
-fi
-
-containerPath=${myDir//${HOME}\//\/hosthome\/}
-docker exec -it itango python3 ${containerPath}/${runThis} 1 -v
diff --git a/crossechoTangoDev/Crossecho.sh b/crossechoTangoDev/Crossecho.sh
deleted file mode 100755
index be0211299..000000000
--- a/crossechoTangoDev/Crossecho.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-runThis=$(basename ${0})
-runThis=${runThis//.sh/.py}
-if [ -f ${runThis} ]; then
- myDir=${PWD}
-else
- myDir=${PWD}/$(dirname ${0})
-fi
-
-containerPath=${myDir//${HOME}\//\/hosthome\/}
-docker exec -it itango python3 ${containerPath}/${runThis} 1 -v
--
GitLab