merged master

408d24aa · Taya Snijder · 776d8a66 · d38353a7 · 408d24aa · 408d24aa
Commit 408d24aa authored 4 years ago by Taya Snijder
--- a/CDB/test_ConfigDb.json
+++ b/CDB/test_ConfigDb.json
@@ -19,17 +19,36 @@
                    "LTS/SDP/1": {
                        "properties": {
                            "OPC_Server_Name": [
-                                "DESPi2.astron.nl"
+                                "dop36.astron.nl"
                            ]
                        }
                    }
                }
            }
        },
-        "example_device": {
+        "APSCTL": {
            "1": {
-                "example_device": {
+                "APSCTL": {
-                    "LTS/example_device/1": {
+                    "LTS/APSCTL/1": {
+                        "properties": {
+                            "OPC_Server_Name": [
+                                "ltspi.astron.nl"
+                            ],
+                            "OPC_Server_Port": [
+                                "4844"
+                            ],
+                            "OPC_Time_Out": [
+                                "5.0"
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "test_device": {
+            "1": {
+                "test_device": {
+                    "LTS/test_device/1": {
                         "attribute_properties": {
                            "Ant_mask_RW": {
                                "archive_period": [

--- a/CDB/thomas_arm64_ConfigDb.json
+++ b/CDB/thomas_arm64_ConfigDb.json
+{
+    "servers": {
+        "PCC": {
+            "LTS": {
+                "PCC": {
+                    "LTS/PCC/1": {
+                        "properties": {
+                            "OPC_Server_Name": [
+                                "arm2"
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "SDP": {
+            "LTS": {
+                "SDP": {
+                    "LTS/SDP/1": {
+                        "properties": {
+                            "OPC_Server_Name": [
+                                "okeanos"
+                            ]
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/CDB/windows_ConfigDb.json
+++ b/CDB/windows_ConfigDb.json
@@ -26,10 +26,62 @@
                }
            }
        },
-        "example_device": {
+		"ini_device": {
            "1": {
-                "example_device": {
+                "ini_device": {
-                    "LTS/example_device/1": {
+                    "LTS/ini_device/1": {
+                         "attribute_properties": {
+                            "Ant_mask_RW": {
+                                "archive_period": [
+                                    "600000"
+                                ]
+                            }
+						},
+                        "properties": {
+                            "SNMP_community": [
+                                "public"
+                            ],
+                            "SNMP_host": [
+                                "172.22.176.1"
+                            ],
+                            "SNMP_timeout": [
+                                "5.0"
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "SNMP": {
+            "1": {
+                "SNMP": {
+                    "LTS/SNMP/1": {
+                         "attribute_properties": {
+                            "Ant_mask_RW": {
+                                "archive_period": [
+                                    "600000"
+                                ]
+                            }
+						},
+                        "properties": {
+                            "SNMP_community": [
+                                "public"
+                            ],
+                            "SNMP_host": [
+                                "172.22.176.1"
+                            ],
+                            "SNMP_timeout": [
+                                "5.0"
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+		"test_device": {
+            "1": {
+                "test_device": {
+                    "LTS/test_device/1": {
                         "attribute_properties": {
                            "Ant_mask_RW": {
                                "archive_period": [

--- a/PCC/LICENSE.txt
+++ b/PCC/LICENSE.txt
--- a/PCC/MANIFEST.in
+++ b/PCC/MANIFEST.in
--- a/PCC/NOTICE
+++ b/PCC/NOTICE
--- a/PCC/PCC/PCC.py
+++ b/PCC/PCC/PCC.py
--- a/PCC/PCC/__init__.py
+++ b/PCC/PCC/__init__.py
--- a/PCC/PCC/__main__.py
+++ b/PCC/PCC/__main__.py
--- a/PCC/PCC/opcua_connection.py
+++ b/PCC/PCC/opcua_connection.py
--- a/PCC/PCC/release.py
+++ b/PCC/PCC/release.py
--- a/PCC/PCC/wrappers.py
+++ b/PCC/PCC/wrappers.py
--- a/PCC/README.rst
+++ b/PCC/README.rst
--- a/PCC/requirements.txt
+++ b/PCC/requirements.txt
--- a/PCC/setup.py
+++ b/PCC/setup.py
--- a/PCC/test/PCC_test.py
+++ b/PCC/test/PCC_test.py
--- a/PCC/test/__init__.py
+++ b/PCC/test/__init__.py
--- a/PCC/test/test-PCC.py
+++ b/PCC/test/test-PCC.py
--- a/SDP/LICENSE.txt
+++ b/SDP/LICENSE.txt
--- a/SDP/MANIFEST.in
+++ b/SDP/MANIFEST.in