Merge pull request #104 from atlanticwave-sdx/103.topology-files-refa…

…ctoring

Move topology files from pce to datamodel

.github/workflows/test.yml

@@ -28,6 +28,7 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
 
     steps:
       - name: Check out code

.gitignore

@@ -25,3 +25,6 @@ dist/
 /.coverage.el
 /coverage.xml
 /coverage.lcov
+
+# Ignore directories created by testing tools.
+/.tox/

pyproject.toml

@@ -19,7 +19,8 @@ classifiers = [
 ]
 dependencies = [
     "grenml",
-    "networkx"
+    "networkx",
+    "importlib-resources; python_version < '3.9'",
 ]
 
 [project.urls]
@@ -30,7 +31,6 @@ Issues = "https://github.com/atlanticwave-sdx/datamodel/issues"
 test = [
     "pytest >= 7.1.2",
     "pytest-cov >= 3.0.0",
-    "matplotlib"
 ]
 
 [options.packages.find]

src/sdx_datamodel/data/requests/test_request.json

@@ -0,0 +1,20 @@
+{
+    "id": "test-connection-request",
+    "name": "Test connection request",
+    "start_time": "2000-01-23T04:56:07.000Z",
+    "end_time": "2000-01-23T04:56:07.000Z",
+    "bandwidth_required": 10,
+    "latency_required": 300,
+    "egress_port": {
+        "id": "urn:sdx:port:amlight.net:A1:1",
+        "name": "Novi100:1",
+        "node": "urn:sdx:node:amlight.net:A1",
+        "status": "up"
+    },
+    "ingress_port": {
+        "id": "urn:ogf:network:sdx:port:zaoxi:A1:2",
+        "name": "Novi100:2",
+        "node": "urn:ogf:network:sdx:node:zaoxi:A1",
+        "status": "up"
+    }
+}

tests/data/test_request.json → src/sdx_datamodel/data/requests/test_request_no_node.json

@@ -5,14 +5,12 @@
     "end_time": "2000-01-23T04:56:07.000Z",
     "bandwidth_required": 100,
     "latency_required": 20,
-    "egress_port":
-    {
+    "egress_port": {
         "id": "urn:sdx:port:amlight.net:A1:1",
         "name": "Novi100:1"
     },
-    "ingress_port":
-    {
+    "ingress_port": {
         "id": "urn:ogf:network:sdx:port:zaoxi:A1:2",
         "name": "Novi100:2"
     }
-}
+}

tests/data/p2p.json → src/sdx_datamodel/data/requests/test_request_p2p.json

@@ -5,22 +5,20 @@
     "end_time": "2000-01-23T04:56:07.000Z",
     "bandwidth_required": 100,
     "latency_required": 20,
-    "egress_port":
-    {
+    "egress_port": {
         "id": "urn:sdx:port:amlight.net:Novi07:10",
         "name": "10",
         "short_name": "Novi07:10",
         "label": "vlan",
         "label_range": "100",
         "node": "urn:sdx:port:amlight.net:Novi07"
     },
-    "ingress_port":
-    {
+    "ingress_port": {
         "id": "urn:sdx:port:amlight.net:Novi06:9",
         "name": "Novi06:9",
         "short_name": "Novi06:9",
         "label": "vlan",
         "label_range": "100",
         "node": "urn:sdx:port:amlight.net:Novi06"
     }
-}
+}