Skip to content

W
White Rabbit Starting Kit
Commit 7f3e4ae3 authored by Benoit Rat's avatar Benoit Rat
Browse files
Options

Merge branch 'proposed_master' into develop

parents 07cb2af3 8269bb7c
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 79 deletions
test/.gitignore 0 → 100644
View file @ 7f3e4ae3
# .gitignore file
# configuration file #
######################
configuration.cfg
test/dockers/README.md 0 → 100644
View file @ 7f3e4ae3
Dokerfiles to deployment test
==========================
To build image
----------
You need to move to UbuntuXX folder and execute:
sudo docker build -t <name image> .
To run image
----------
You need to execute:
sudo docker run -it <name image>
Show images
----------
sudo docker images
Remove image
----------
sudo docker rmi -f <IMAGE ID>
\ No newline at end of file
test/dockers/ubuntu16/Dockerfile
View file @ 7f3e4ae3
...@@ -15,8 +15,13 @@ RUN \ ...@@ -15,8 +15,13 @@ RUN \
linux-headers-4.8.0-34-generic \ linux-headers-4.8.0-34-generic \
linux-headers-4.10.0-14-generic \ linux-headers-4.10.0-14-generic \
linux-headers-4.13.0-16-generic \ linux-headers-4.13.0-16-generic \
linux-headers-4.15.0-13-generic &&\ linux-headers-4.15.0-13-generic
git clone https://ohwr.org/project/spec-sw.git
# Clone repository and detach HEAD
RUN \
git clone https://ohwr.org/project/spec-sw.git &&\
cd spec-sw &&\
git checkout 36f70fe4
#set enviroment variable for kernel version 4.4.0-21-generic #set enviroment variable for kernel version 4.4.0-21-generic
ENV LINUX /lib/modules/4.4.0-21-generic/build ENV LINUX /lib/modules/4.4.0-21-generic/build
......
test/dockers/ubuntu18/Dockerfile
View file @ 7f3e4ae3
...@@ -13,8 +13,13 @@ RUN \ ...@@ -13,8 +13,13 @@ RUN \
apt-get install -y git \ apt-get install -y git \
build-essential \ build-essential \
linux-headers-4.15.0-47-generic \ linux-headers-4.15.0-47-generic \
linux-headers-4.18.0-17-generic &&\ linux-headers-4.18.0-17-generic
git clone https://ohwr.org/project/spec-sw.git
# Clone repository and detach HEAD
RUN \
git clone https://ohwr.org/project/spec-sw.git &&\
cd spec-sw &&\
git checkout 36f70fe4
#set enviroment variable for kernel version 4.15.0-47-generic #set enviroment variable for kernel version 4.15.0-47-generic
ENV LINUX /lib/modules/4.15.0-47-generic/build ENV LINUX /lib/modules/4.15.0-47-generic/build
......
test/validation/README.md 0 → 100644
View file @ 7f3e4ae3
The files in this folder are the following:
* `dio.py`: Class to interact with the ports of the board.
* `loadDriver.py`: Load the driver on the PC.
* `sample.cfg`: Sample configuration file of the tests, to execute the tests must be modified the parameters and renamed the file to `configuration.cfg`.
* `ssh.py`: Class used to execute commands by SSH.
* `testAdvDIO.py`: Verifies the correct reception and sending of packages.
* `testAll.py`: Execute all tests.
* `testDIO.py`: Check all ports of the boards.
* `testNIC.py`: Verifies the correct operation of the Network Interface Core.
* `testWR.py`: Check the correct operation of White Rabbit.
* `vuart.py`: Class to execute commands by virtual uart.
test/validation/dio.py
View file @ 7f3e4ae3
# @file dio.py # @file dio.py
# #
# @brief # @brief This class is to interact with the ports of the board
# #
# @author Manuel Castilla # @author Manuel Castilla
# @ingroup
# @date 23/04/2019 # @date 23/04/2019
# #
########################################################################### ###########################################################################
...@@ -135,3 +134,4 @@ class DIO (): ...@@ -135,3 +134,4 @@ class DIO ():
self.sshCmd.printSshErrorCommand(e.strError) #print error command self.sshCmd.printSshErrorCommand(e.strError) #print error command
cleanup() cleanup()
raise raise
test/validation/loadDriver.py
View file @ 7f3e4ae3
#!/usr/bin/env python3 #!/usr/bin/env python3
# @file loadDriver.py # @file loadDriver.py
# #
# @brief # @brief Load the driver on the PC
# #
# @author Manuel Castilla # @author Manuel Castilla
# @ingroup
# @date 16/04/2019 # @date 16/04/2019
# #
########################################################################### ###########################################################################
...@@ -70,4 +69,4 @@ password = getpass.getpass() ...@@ -70,4 +69,4 @@ password = getpass.getpass()
if (loadDriver(hostName,userName,password) == 0): if (loadDriver(hostName,userName,password) == 0):
print("Load driver: ok") print("Load driver: ok")
else: else:
print("Load driver: error") print("Load driver: error")
\ No newline at end of file
test/validation/sample.cfg 0 → 100644
View file @ 7f3e4ae3
[pc1]
hostName = 172.17.5.196
userName = test
password = test
busIdSpec = 0x01
interfaceName = wr0
ipWR = 192.168.2.100
[pc2]
hostName = 172.17.5.238
userName = test
password =test
busIdSpec = 0x01
ipWR = 192.168.2.200
interfaceName = wr0
\ No newline at end of file
test/validation/ssh.py
View file @ 7f3e4ae3
# @file ssh.py # @file ssh.py
# #
# @brief Command ssh # @brief This class is used to execute commands by SSH
# #
# @author Manuel Castilla # @author Manuel Castilla
# @ingroup
# @date 05/04/2019 # @date 05/04/2019
# #
########################################################################### ###########################################################################
...@@ -56,7 +55,7 @@ class SshCmd (): ...@@ -56,7 +55,7 @@ class SshCmd ():
Raises: Raises:
SshCmdException SshCmdException
Return: Return:
command result command result
""" """
resp = "" resp = ""
......
test/validation/testAdvDIO.py
View file @ 7f3e4ae3
#!/usr/bin/env python3 #!/usr/bin/env python3
# @file testAdvDIO.py # @file testAdvDIO.py
# #
# @brief # @brief Check the correct reception and sending of packages
# #
# @author Manuel Castilla # @author Manuel Castilla
# @ingroup
# @date 25/04/2019 # @date 25/04/2019
# #
########################################################################### ###########################################################################
...@@ -112,15 +111,15 @@ if __name__ == '__main__': ...@@ -112,15 +111,15 @@ if __name__ == '__main__':
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.readfp(open(nameConfig)) config.readfp(open(nameConfig))
configuration["hostName1"] = config.get('config',"hostName1") configuration["hostName1"] = config.get('pc1',"hostName")
configuration["userName1"] = config.get('config',"userName1") configuration["userName1"] = config.get('pc1',"userName")
configuration["password1"] = config.get('config',"password1") configuration["password1"] = config.get('pc1',"password")
configuration["interfaceName1"] = config.get('config',"interfaceName1") configuration["interfaceName1"] = config.get('pc1',"interfaceName")
configuration["hostName2"] = config.get('config',"hostName2") configuration["hostName2"] = config.get('pc2',"hostName")
configuration["userName2"] = config.get('config',"userName2") configuration["userName2"] = config.get('pc2',"userName")
configuration["password2"] = config.get('config',"password2") configuration["password2"] = config.get('pc2',"password")
configuration["interfaceName2"] = config.get('config',"interfaceName2") configuration["interfaceName2"] = config.get('pc2',"interfaceName")
main(configuration) main(configuration)
except configparser.Error as e: except configparser.Error as e:
print("Error load configuration:",e.message) print("Error load configuration:",e.message)
\ No newline at end of file
test/validation/testAll.py
View file @ 7f3e4ae3
#!/usr/bin/env python3 #!/usr/bin/env python3
# @file testAll.py # @file testAll.py
# #
# @brief # @brief Execute all tests
# #
# @author Manuel Castilla # @author Manuel Castilla
# @ingroup
# @date 29/04/2019 # @date 29/04/2019
# #
########################################################################### ###########################################################################
...@@ -36,19 +35,19 @@ if __name__ == '__main__': ...@@ -36,19 +35,19 @@ if __name__ == '__main__':
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.readfp(open(nameConfig)) config.readfp(open(nameConfig))
configuration["hostName1"] = config.get('config',"hostName1") configuration["hostName1"] = config.get('pc1',"hostName")
configuration["userName1"] = config.get('config',"userName1") configuration["userName1"] = config.get('pc1',"userName")
configuration["password1"] = config.get('config',"password1") configuration["password1"] = config.get('pc1',"password")
configuration["busIdSpec1"] = config.get('config',"busIdSpec1") configuration["busIdSpec1"] = config.get('pc1',"busIdSpec")
configuration["ipWR1"] = config.get('config',"ipWR1") configuration["ipWR1"] = config.get('pc1',"ipWR")
configuration["interfaceName1"] = config.get('config',"interfaceName1") configuration["interfaceName1"] = config.get('pc1',"interfaceName")
configuration["hostName2"] = config.get('config',"hostName2") configuration["hostName2"] = config.get('pc2',"hostName")
configuration["userName2"] = config.get('config',"userName2") configuration["userName2"] = config.get('pc2',"userName")
configuration["password2"] = config.get('config',"password2") configuration["password2"] = config.get('pc2',"password")
configuration["busIdSpec2"] = config.get('config',"busIdSpec2") configuration["busIdSpec2"] = config.get('pc2',"busIdSpec")
configuration["ipWR2"] = config.get('config',"ipWR2") configuration["ipWR2"] = config.get('pc2',"ipWR")
configuration["interfaceName2"] = config.get('config',"interfaceName2") configuration["interfaceName2"] = config.get('pc2',"interfaceName")
main(configuration) main(configuration)
except configparser.Error as e: except configparser.Error as e:
print("Error load configuration:",e.message) print("Error load configuration:",e.message)
\ No newline at end of file
test/validation/testDIO.py
View file @ 7f3e4ae3
#!/usr/bin/env python3 #!/usr/bin/env python3
# @file testDIO.py # @file testDIO.py
# #
# @brief # @brief Check all ports of the boards
# #
# @author Manuel Castilla # @author Manuel Castilla
# @ingroup
# @date 25/04/2019 # @date 25/04/2019
# #
########################################################################### ###########################################################################
...@@ -123,15 +122,15 @@ if __name__ == '__main__': ...@@ -123,15 +122,15 @@ if __name__ == '__main__':
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.readfp(open(nameConfig)) config.readfp(open(nameConfig))
configuration["hostName1"] = config.get('config',"hostName1") configuration["hostName1"] = config.get('pc1',"hostName")
configuration["userName1"] = config.get('config',"userName1") configuration["userName1"] = config.get('pc1',"userName")
configuration["password1"] = config.get('config',"password1") configuration["password1"] = config.get('pc1',"password")
configuration["interfaceName1"] = config.get('config',"interfaceName1") configuration["interfaceName1"] = config.get('pc1',"interfaceName")
configuration["hostName2"] = config.get('config',"hostName2") configuration["hostName2"] = config.get('pc2',"hostName")
configuration["userName2"] = config.get('config',"userName2") configuration["userName2"] = config.get('pc2',"userName")
configuration["password2"] = config.get('config',"password2") configuration["password2"] = config.get('pc2',"password")
configuration["interfaceName2"] = config.get('config',"interfaceName2") configuration["interfaceName2"] = config.get('pc2',"interfaceName")
main(configuration) main(configuration)
except configparser.Error as e: except configparser.Error as e:
print("Error load configuration:",e.message) print("Error load configuration:",e.message)
\ No newline at end of file
test/validation/testNIC.py
View file @ 7f3e4ae3
#!/usr/bin/env python3 #!/usr/bin/env python3
# @file testNIC.py # @file testNIC.py
# #
# @brief # @brief Check the correct operation of the Network Interface Core
# #
# @author Manuel Castilla # @author Manuel Castilla
# @ingroup
# @date 16/04/2019 # @date 16/04/2019
# #
########################################################################### ###########################################################################
...@@ -125,18 +124,18 @@ if __name__ == '__main__': ...@@ -125,18 +124,18 @@ if __name__ == '__main__':
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.readfp(open(nameConfig)) config.readfp(open(nameConfig))
configuration["hostName1"] = config.get('config',"hostName1") configuration["hostName1"] = config.get('pc1',"hostName")
configuration["userName1"] = config.get('config',"userName1") configuration["userName1"] = config.get('pc1',"userName")
configuration["password1"] = config.get('config',"password1") configuration["password1"] = config.get('pc1',"password")
configuration["busIdSpec1"] = config.get('config',"busIdSpec1") configuration["busIdSpec1"] = config.get('pc1',"busIdSpec")
configuration["ipWR1"] = config.get('config',"ipWR1") configuration["ipWR1"] = config.get('pc1',"ipWR")
configuration["interfaceName1"] = config.get('config',"interfaceName1") configuration["interfaceName1"] = config.get('pc1',"interfaceName")
configuration["hostName2"] = config.get('config',"hostName2") configuration["hostName2"] = config.get('pc2',"hostName")
configuration["userName2"] = config.get('config',"userName2") configuration["userName2"] = config.get('pc2',"userName")
configuration["password2"] = config.get('config',"password2") configuration["password2"] = config.get('pc2',"password")
configuration["busIdSpec2"] = config.get('config',"busIdSpec2") configuration["busIdSpec2"] = config.get('pc2',"busIdSpec")
configuration["ipWR2"] = config.get('config',"ipWR2") configuration["ipWR2"] = config.get('pc2',"ipWR")
configuration["interfaceName2"] = config.get('config',"interfaceName2") configuration["interfaceName2"] = config.get('pc2',"interfaceName")
main(configuration) main(configuration)
except configparser.Error as e: except configparser.Error as e:
......
test/validation/testWR.py
View file @ 7f3e4ae3
#!/usr/bin/env python3 #!/usr/bin/env python3
# @file testWR.py # @file testWR.py
# #
# @brief # @brief Check the correct operation of White Rabbit
# #
# @author Manuel Castilla # @author Manuel Castilla
# @ingroup
# @date 23/04/2019 # @date 23/04/2019
# #
########################################################################### ###########################################################################
...@@ -143,17 +142,17 @@ if __name__ == '__main__': ...@@ -143,17 +142,17 @@ if __name__ == '__main__':
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.readfp(open(nameConfig)) config.readfp(open(nameConfig))
configuration["hostName1"] = config.get('config',"hostName1") configuration["hostName1"] = config.get('pc1',"hostName")
configuration["userName1"] = config.get('config',"userName1") configuration["userName1"] = config.get('pc1',"userName")
configuration["password1"] = config.get('config',"password1") configuration["password1"] = config.get('pc1',"password")
configuration["busIdSpec1"] = config.get('config',"busIdSpec1") configuration["busIdSpec1"] = config.get('pc1',"busIdSpec")
configuration["interfaceName1"] = config.get('config',"interfaceName1") configuration["interfaceName1"] = config.get('pc1',"interfaceName")
configuration["hostName2"] = config.get('config',"hostName2") configuration["hostName2"] = config.get('pc2',"hostName")
configuration["userName2"] = config.get('config',"userName2") configuration["userName2"] = config.get('pc2',"userName")
configuration["password2"] = config.get('config',"password2") configuration["password2"] = config.get('pc2',"password")
configuration["busIdSpec2"] = config.get('config',"busIdSpec2") configuration["busIdSpec2"] = config.get('pc2',"busIdSpec")
configuration["interfaceName2"] = config.get('config',"interfaceName2") configuration["interfaceName2"] = config.get('pc2',"interfaceName")
main(configuration) main(configuration)
except configparser.Error as e: except configparser.Error as e:
print("Error load configuration:",e.message) print("Error load configuration:",e.message)
\ No newline at end of file
test/validation/vuart.py
View file @ 7f3e4ae3
# @file vuart.py # @file vuart.py
# #
# @brief # @brief This class is to execute commands by virtual uart
# #
# @author Manuel Castilla # @author Manuel Castilla
# @ingroup
# @date 23/04/2019 # @date 23/04/2019
# #
########################################################################### ###########################################################################
...@@ -185,4 +184,4 @@ class Vuart (): ...@@ -185,4 +184,4 @@ class Vuart ():
except SshCmdException as e: except SshCmdException as e:
self.sshCmd.printSshErrorCommand(e.strError) #print error command self.sshCmd.printSshErrorCommand(e.strError) #print error command
cleanup() cleanup()
raise raise
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment