add integration test for MT SampleServer

umati · Jul 19, 2023 · 00f89ad · 00f89ad
1 parent cae6269
commit 00f89ad
Show file tree

Hide file tree

Showing 11 changed files with 1,765 additions and 2 deletions.
diff --git a/.github/linters/.jscpd.json b/.github/linters/.jscpd.json
@@ -4,7 +4,8 @@
       "consoleFull"
     ],
     "ignore": [
-      "**/__snapshots__/**"
+      "**/__snapshots__/**",
+      "**/mqtt_test/schemas/**"
     ],
     "absolute": true
   }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -153,4 +153,14 @@
             tags: |
               ghcr.io/${{ env.IMAGE_REPOSITORY }}:${{ env.IMAGE_TAG }}
             provenance: false
+        - name: Run integration test mqtt
+          if: ${{env.IS_NOT_PR == 'true'}}
+          run : |
+            #! /bin/bash
+            python -m pip install --upgrade pip
+            cd ./UmatiDashboardOpcUaClient/Tests/integration/mqtt_test || exit
+            pip install -r requirements.txt
+            docker compose up -d
+            ./waitForContainer.sh
+            python -m unittest discover test_mqtt_sampleserver
   
diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ Follow these instructions to use the client as a testing tool for your implement
 
 For the local instance testing you need to run your own MQTT Broker and a MQTT Client. See [MQTT Doc](doc/MQTT.md) for more information and instructions
 
-[Here](example/SampleServer/) is an docker-compose example including a mqtt broker, a umati Sample Server and the gateway. The example contains also the need configuration for the samples. 
+[Here](example/ShowcaseDeployment/) is an docker-compose example including a mqtt broker, a umati Sample Server and the gateway. The example contains also the need configuration for the samples. 
 
 ### Usage for connecting a server to the dashboard
 

diff --git a/Tests/integration/mqtt_test/configuration.json b/Tests/integration/mqtt_test/configuration.json
@@ -0,0 +1,305 @@
+{
+  "OpcUa": {
+    "Endpoint": "opc.tcp://opcuaserver:4840",
+    "Username": "",
+    "Password": "",
+    "Security": 1
+  },
+  "Mqtt": {
+    "Hostname": "mqtt_broker",
+    "Port": 1883,
+    "Username": "umati/mqtt_test",
+    "Password": "",
+    "Prefix": "umati/v2",
+    "ClientId": "umati/mqtt_test",
+    "Protocol": "tcp"
+  },
+  "MachineCacheFile": "MachineCache_datahub.json",
+  "MachinesFilter": [  ],
+  "ObjectTypeNamespaces": [
+    "http://opcfoundation.org/UA/",
+    "http://opcfoundation.org/UA/IA/",
+    "http://opcfoundation.org/UA/DI/",
+    "http://opcfoundation.org/UA/Dictionary/IRDI",
+    "http://opcfoundation.org/UA/Machinery/",
+    "http://opcfoundation.org/UA/Machinery/ProcessValues/",
+    "http://opcfoundation.org/UA/Machinery/Result/",
+    "http://opcfoundation.org/UA/MachineTool/",
+    "http://opcfoundation.org/UA/PADIM/",
+    "http://opcfoundation.org/UA/AdditiveManufacturing/NodeSet2/",
+    "http://opcfoundation.org/UA/Woodworking/",
+    "http://opcfoundation.org/UA/Robotics/",
+    "http://opcfoundation.org/UA/IJT/",
+    "http://opcfoundation.org/GMS/",
+    "http://opcfoundation.org/UA/PlasticsRubber/GeneralTypes/",
+    "http://opcfoundation.org/UA/PlasticsRubber/IMM2MES/",
+    "http://opcfoundation.org/UA/PlasticsRubber/TCD/",
+    "http://opcfoundation.org/UA/PlasticsRubber/HotRunner/",
+    "http://opcfoundation.org/UA/PlasticsRubber/LDS/",
+    "http://opcfoundation.org/UA/PlasticsRubber/Extrusion_v2/GeneralTypes/",
+    "http://opcfoundation.org/UA/PlasticsRubber/Extrusion_v2/HaulOff/",
+    "http://opcfoundation.org/UA/PlasticsRubber/Extrusion_v2/Corrugator/",
+    "http://opcfoundation.org/UA/PlasticsRubber/Extrusion_v2/Extruder/",
+    "http://opcfoundation.org/UA/PlasticsRubber/umati/generic/",
+    "http://opcfoundation.org/UA/PlasticsRubber/umati/OPC40079ForUmati/",
+    "http://opcfoundation.org/UA/PlasticsRubber/ImmToRobot/",
+    "http://opcfoundation.org/UA/Glass/Flat/",
+    "http://lenord.de/umati/MiniCODER/"
+  ],
+  "NamespaceInformations": [
+    {
+      "Namespace": "http://opcfoundation.org/UA/Robotics/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/Robotics/",
+          "Id": "i=1004",
+          "BaseTypeLevel": 0,
+          "$comment": "MotionDeviceType"
+        },
+        {
+          "Uri": "http://opcfoundation.org/UA/Robotics/",
+          "Id": "i=1003",
+          "BaseTypeLevel": 0,
+          "$comment": "ControllerType"
+        },
+        {
+          "Uri": "http://opcfoundation.org/UA/Robotics/",
+          "Id": "i=1002",
+          "BaseTypeLevel": 0,
+          "$comment": "MotionDeviceSystemType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "BaseTypeLevel": 0,
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/IJT/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/IJT/",
+          "Id": "i=1005",
+          "$comment": "TighteningSystemType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/MachineTool-Prototyping/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/MachineTool-Prototyping/",
+          "Id": "i=1014",
+          "$comment": "MachineToolType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/MachineTool-Prototyping/",
+        "Id": "i=1012",
+        "$comment": "MachineToolIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/MachineTool/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/MachineTool/",
+          "Id": "i=13",
+          "$comment": "MachineToolType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/MachineTool/",
+        "Id": "i=11",
+        "$comment": "MachineToolIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/Woodworking/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/Woodworking/",
+          "Id": "i=2",
+          "$comment": "WwMachineType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/GMS/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/GMS/",
+          "Id": "i=1002",
+          "$comment": "GMSType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/GMS/",
+        "Id": "i=1011",
+        "$comment": "GMSIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/PlasticsRubber/umati/generic/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/PlasticsRubber/umati/generic/",
+          "Id": "i=1002",
+          "$comment": "UmatiPlasticsRubberGenericType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/PlasticsRubber/IMM2MES/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/PlasticsRubber/IMM2MES/",
+          "Id": "i=1007",
+          "$comment": "IMM_MES_InterfaceType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/PlasticsRubber/Extrusion_v2/Extruder/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/PlasticsRubber/Extrusion_v2/Extruder/",
+          "Id": "i=1015",
+          "$comment": "Extruder_InterfaceType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/PlasticsRubber/Extrusion_v2/Corrugator/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/PlasticsRubber/Extrusion_v2/Corrugator/",
+          "Id": "i=1003",
+          "$comment": "Corrugator_InterfaceType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/PlasticsRubber/LDS/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/PlasticsRubber/LDS/",
+          "Id": "i=1007",
+          "$comment": "LDS_InterfaceType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/PlasticsRubber/HotRunner/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/PlasticsRubber/HotRunner/",
+          "Id": "i=1010",
+          "$comment": "HRD_InterfaceType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/PlasticsRubber/TCD/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/PlasticsRubber/TCD/",
+          "Id": "i=1012",
+          "$comment": "TCD_InterfaceType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/PlasticsRubber/umati/OPC40079ForUmati/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/PlasticsRubber/umati/OPC40079ForUmati/",
+          "Id": "i=1003",
+          "$comment": "ImmRobotCellType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Machinery/",
+        "Id": "i=1012",
+        "$comment": "MachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/Glass/Flat/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/Glass/Flat/",
+          "Id": "i=1015",
+          "$comment": "GlassMachineType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/Glass/Flat/",
+        "Id": "i=1020",
+        "$comment": "GlassMachineIdentificationType"
+      }
+    },
+    {
+      "Namespace": "http://opcfoundation.org/UA/AdditiveManufacturing/NodeSet2/",
+      "Types": [
+        {
+          "Uri": "http://opcfoundation.org/UA/AdditiveManufacturing/NodeSet2/",
+          "Id": "i=1031",
+          "$comment": "AdditiveManufacturingType"
+        }
+      ],
+      "IdentificationType": {
+        "Uri": "http://opcfoundation.org/UA/AdditiveManufacturing/NodeSet2/",
+        "Id": "i=1028",
+        "$comment": "MachineIdentificationAMType"
+      }
+    }
+  ]
+}
diff --git a/Tests/integration/mqtt_test/docker-compose.yml b/Tests/integration/mqtt_test/docker-compose.yml
@@ -0,0 +1,20 @@
+---
+version: '3.1'
+services:
+  mqtt_broker:
+    image: eclipse-mosquitto
+    volumes:
+      - ./mosquitto.conf:/mosquitto/config/mosquitto.conf
+    ports:
+      - 1883:1883
+  opcuaserver:
+    image: ghcr.io/umati/sample-server:develop
+    ports:
+      - 4840:4840
+  gateway:
+    depends_on:
+      - mqtt_broker
+      - opcuaserver
+    image: ghcr.io/${IMAGE_REPOSITORY}:${IMAGE_TAG}
+    volumes:
+      - ./configuration.json:/app/configuration.json
diff --git a/Tests/integration/mqtt_test/mosquitto.conf b/Tests/integration/mqtt_test/mosquitto.conf
@@ -0,0 +1,7 @@
+listener 1883
+protocol mqtt
+
+log_dest stdout
+log_type all
+
+allow_anonymous true
diff --git a/Tests/integration/mqtt_test/requirements.txt b/Tests/integration/mqtt_test/requirements.txt
@@ -0,0 +1,3 @@
+jsonschema>=4.17.3
+paho-mqtt>=1.6.1
+