added MTD and removed unnecessary packages

ATNoG · Nov 11, 2021 · 1b0c0ea · 1b0c0ea
1 parent 41a7012
commit 1b0c0ea
Show file tree

Hide file tree

Showing 297 changed files with 5,009 additions and 1,294 deletions.
diff --git a/...vnf/charms/interdomainvdu/.build.manifest → ...n+MTD/charm/builds/mtdvdu/.build.manifest b/...vnf/charms/interdomainvdu/.build.manifest → ...n+MTD/charm/builds/mtdvdu/.build.manifest
@@ -25,9 +25,8 @@
       "url": "layer:vnfproxy"
     },
     {
-      "branch": "refs/heads/main",
-      "rev": "bee1f2d9771ff94d6f303ecac704df3908f7c3a5",
-      "url": "interdomainvdu"
+      "rev": "",
+      "url": "mtdvdu"
     }
   ],
   "signatures": {
@@ -57,7 +56,7 @@
       "b7ab3a34e5faf79b96a8632039a0ad0aa87f2a9b5f0ba604e007cafb22190301"
     ],
     "README.ex": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "eb25333fb6ee2abc2d5dde329dfd6b4b2a6dd5516094e75354fb6cd84010afad"
     ],
@@ -67,77 +66,72 @@
       "fed2909a56f740deec009fed50deffe9b017531a5ef6bcde6d2ec519e19d4014"
     ],
     "actions.yaml": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
-      "e80d7f36dd6b37726b4f4ad1892eaad318f3cbb0225abf0c905dd2645f8f0901"
+      "a7f6fd0dae8f26806b9b65cf885888a6e463ddd79b25d3dced1957f55e372168"
     ],
-    "actions/addpeer": [
-      "interdomainvdu",
+    "actions/activatemtd": [
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
-    "actions/generate-ssh-key": [
-      "interdomainvdu",
+    "actions/configurebridge": [
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
-    "actions/get-ssh-public-key": [
-      "interdomainvdu",
+    "actions/generate-ssh-key": [
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
-    "actions/getvnfinfo": [
-      "interdomainvdu",
+    "actions/get-ssh-public-key": [
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
-    "actions/modifytunnel": [
-      "interdomainvdu",
+    "actions/getmtdinfo": [
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
     "actions/reboot": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
     "actions/restart": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
     "actions/run": [
-      "interdomainvdu",
-      "static",
-      "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
-    ],
-    "actions/sendvnfinfo": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
     "actions/start": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
     "actions/stop": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
     "actions/touch": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
     "actions/upgrade": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
     "actions/verify-ssh-credentials": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "214f7a2f52c914a4cbcd6c2cf26c40ab5cc0723db4d85d4fccba6f4cb28e711c"
     ],
@@ -152,9 +146,9 @@
       "e959bf29da4c5edff28b2602c24113c4df9e25cdc9f2aa3b5d46c8577b2a40cc"
     ],
     "config.yaml": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
-      "23a229bc4f0a1dd45a76b1344469f8b1d692a458d37761d6bd36be1035eb8c11"
+      "4d78949672fe84a7b24daff242872895080cf5961e916ab4ad9cb2cd59031810"
     ],
     "copyright": [
       "layer:basic",
@@ -227,14 +221,14 @@
       "2b693cb2a11594a80cc91235c2dc219a0a6303ae62bee8aa87eb35781f7158f7"
     ],
     "icon.svg": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "d20624e9389af6506a8d8a69ac9bba4d41709601b624c0875fd7d6717b395088"
     ],
     "layer.yaml": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
-      "4d5b2cf765b1f7df0fb47c82a5ce7117738a1d45510a2efc9c3f9851ce6fce06"
+      "f279842f7030a240acb175a058b7c8406a6870b196da6d11729a27cc5d47ceba"
     ],
     "lib/charms/layer/__init__.py": [
       "layer:basic",
@@ -262,27 +256,27 @@
       "fba0834f98f570b0b3d6b3e8a7f17b1d8909f50da9410ccda89b586f914b7ffd"
     ],
     "metadata.yaml": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
-      "362721193112a3545854d52199897c5901cdda7059f7b8a3dfcd9d07ff9b0586"
+      "900305bba1f89c024d41fdd568a5206b590a960173b1b848493f346400a0fb37"
     ],
     "reactive/__init__.py": [
       "layer:basic",
       "static",
       "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
     ],
-    "reactive/interdomainvdu.py": [
-      "interdomainvdu",
+    "reactive/mtdvdu.py": [
+      "mtdvdu",
       "static",
-      "1c3d28ccd3f75ab65af90fb9745888ea7b337fde5c1b800eb6ff181720a78a03"
+      "a4fde2391ed254872f8cd728fe873412bd0f4e9c8586eb59914391755ddaa6d5"
     ],
     "reactive/sshproxy.py": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "2a47918df20f5d110b156bd9422ece72a6d54317e6167fef596c76c34bbe745f"
     ],
     "reactive/vnfproxy.py": [
-      "interdomainvdu",
+      "mtdvdu",
       "static",
       "70cdab1dc9c66321e03d56c3110cc71a567e168afad89ac563fb20f83a20edf2"
     ],
@@ -301,28 +295,23 @@
       "static",
       "32dccf698d07a61c23ed35073b30ee5d11278595c4bc45dae1194efab65ef626"
     ],
-    "version": [
-      "interdomainvdu",
-      "dynamic",
-      "d9171687ed794731ef30a0097a13d2e0d9b14c0382f25397299fcb6348fa3feb"
-    ],
     "wheelhouse.txt": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
-      "01779ccb479b627f1549d2c205f8a560f6a487def4f10bdd2807743b55c749db"
+      "5415b852a9f6f9e0c65cc8607911d4a0a7c02fc3dd14f502a89dab1c36a5436c"
     ],
     "wheelhouse/Jinja2-2.10.1.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013"
     ],
     "wheelhouse/MarkupSafe-1.1.1.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"
     ],
     "wheelhouse/PyYAML-5.2.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "c0ee8eca2c582d29c3c2ec6e2c4f703d1b7f1fb10bc72317355a746057e7346c"
     ],
@@ -332,12 +321,12 @@
       "cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c"
     ],
     "wheelhouse/charmhelpers-0.20.22.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "b7550108118ce4f87488343384441797777d0da746e1346ed4e6361b4eab0ddb"
     ],
     "wheelhouse/charms.reactive-1.4.1.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "bba21b4fd40b26c240c9ef2aa10c6fdf73592031c68591da4e7ccc46ca9cb616"
     ],
@@ -347,22 +336,22 @@
       "b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa"
     ],
     "wheelhouse/netaddr-0.7.19.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd"
     ],
     "wheelhouse/paramiko-1.16.3.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "97d932fdb4fec9aadf6bea368123f3ee15b92199f92eb62666370c7fed62d072"
     ],
     "wheelhouse/pbr-5.5.1.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "5fad80b613c402d5b7df7bd84812548b2a61e9977387a80a5fc5c396492b13c9"
     ],
     "wheelhouse/pip-18.1.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1"
     ],
@@ -377,22 +366,22 @@
       "f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c"
     ],
     "wheelhouse/setuptools-41.6.0.zip": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "6afa61b391dcd16cb8890ec9f66cc4015a8a31a6e1c2b4e0c464514be1a3d722"
     ],
     "wheelhouse/setuptools_scm-1.17.0.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "70a4cf5584e966ae92f54a764e6437af992ba42ac4bca7eb37cc5d02b98ec40a"
     ],
     "wheelhouse/six-1.15.0.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"
     ],
     "wheelhouse/wheel-0.33.6.tar.gz": [
-      "interdomainvdu",
+      "mtdvdu",
       "dynamic",
       "10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646"
     ]

diff --git a/...interdomainvdu/.github/workflows/main.yml → .../builds/mtdvdu/.github/workflows/main.yml b/...interdomainvdu/.github/workflows/main.yml → .../builds/mtdvdu/.github/workflows/main.yml
diff --git a/...ovel_vnf/charms/interdomainvdu/.gitignore → ...domain+MTD/charm/builds/mtdvdu/.gitignore b/...ovel_vnf/charms/interdomainvdu/.gitignore → ...domain+MTD/charm/builds/mtdvdu/.gitignore
diff --git a/...n_novel_vnf/charms/interdomainvdu/LICENSE → ...terdomain+MTD/charm/builds/mtdvdu/LICENSE b/...n_novel_vnf/charms/interdomainvdu/LICENSE → ...terdomain+MTD/charm/builds/mtdvdu/LICENSE
diff --git a/..._novel_vnf/charms/interdomainvdu/Makefile → ...erdomain+MTD/charm/builds/mtdvdu/Makefile b/..._novel_vnf/charms/interdomainvdu/Makefile → ...erdomain+MTD/charm/builds/mtdvdu/Makefile
diff --git a/E2E_Interdomain/charms/stupid/README.ex → ...rdomain+MTD/charm/builds/mtdvdu/README.ex b/E2E_Interdomain/charms/stupid/README.ex → ...rdomain+MTD/charm/builds/mtdvdu/README.ex
diff --git a/...novel_vnf/charms/interdomainvdu/README.md → ...rdomain+MTD/charm/builds/mtdvdu/README.md b/...novel_vnf/charms/interdomainvdu/README.md → ...rdomain+MTD/charm/builds/mtdvdu/README.md
diff --git a/...in_vnf/charms/interdomainvdu/actions.yaml → ...main+MTD/charm/builds/mtdvdu/actions.yaml b/...in_vnf/charms/interdomainvdu/actions.yaml → ...main+MTD/charm/builds/mtdvdu/actions.yaml
@@ -51,45 +51,74 @@
       "default": ""
   "required":
   - "filename"
-"addpeer":
-  "description": "Action that adds an allowed peer to the wireguard server"
+
+"getmtdinfo":
+  "description": "Return the Ips and MACs of the relevant interfaces"
+
+"configurebridge":
+  "description": "Configures dynamically the bridge interface"
+
+"activatemtd":
+  "description": "Activates the MTD mechanism"
   "params":
-    "peer_endpoint":
-      "description": "Public Endpoint of the peer"
+    "ip-client":
+      "description": "Service Client Ip"
       "type": "string"
       "default": ""
-    "peer_key":
-      "description": "Public key of the peer"
+    "mac-client":
+      "description": "Service Client MAC"
       "type": "string"
       "default": ""
-    "peer_network":
-      "description": "Network to assign of the peer"
+    "ip-server":
+      "description": "Service Server Ip"
       "type": "string"
       "default": ""
-  "required":
-  - "peer_endpoint"
-  - "peer_key"
-  - "peer_network"
-
-"sendvnfinfo":
-  "description": "Automatically sends tunnel info to an external entity"
-  "params":
-    "vsEndpoint":
-      "description": "Address of the remote VS server"
+    "mac-server":
+      "description": "Service Server MAC"
       "type": "string"
-      "default": "10.0.12.118:5555/vnf"
-  "required":
-  - "vsEndpoint"
-
-"getvnfinfo":
-  "description": "Returns the VNF's tunnel info"
-
-"modifytunnel":
-  "description": "Updates the bandwidth of the tunnel"
-  "params":
-    "bandwidth":
-      "description": "Bandwidth the tunnel should support"
+      "default": ""
+    "mac-gw-client":
+      "description": "Service Client GW MAC"
+      "type": "string"
+      "default": ""
+    "mac-gw-server":
+      "description": "Service Server GW MAC"
       "type": "string"
-      "default": "100"
+      "default": ""
+    "ip-mtd-client-internal":
+      "description": "MTD Client Internal IP"
+      "type": "string"
+      "default": ""
+    "ip-mtd-server-internal":
+      "description": "MTD Server Internal IP"
+      "type": "string"
+      "default": ""
+    "ip-mtd-client-public":
+      "description": "MTD Client Public IP"
+      "type": "string"
+      "default": ""
+    "ip-mtd-server-public":
+      "description": "MTD Server Public IP"
+      "type": "string"
+      "default": ""
+    "mac-mtd-client":
+      "description": "MTD Client MAC"
+      "type": "string"
+      "default": ""
+    "mac-mtd-server":
+      "description": "MTD Server MAC"
+      "type": "string"
+      "default": ""
   "required":
-  - "bandwidth"
+  - "ip-client"
+  - "mac-client"
+  - "ip-server"
+  - "mac-server"
+  - "mac-gw-client"
+  - "mac-gw-server"
+  - "ip-mtd-client-internal"
+  - "ip-mtd-server-internal"
+  - "ip-mtd-client-public"
+  - "ip-mtd-server-public"
+  - "mac-mtd-client"
+  - "mac-mtd-server"
diff --git a/...in/charms/stupid/actions/generate-ssh-key → ...D/charm/builds/mtdvdu/actions/activatemtd b/...in/charms/stupid/actions/generate-ssh-key → ...D/charm/builds/mtdvdu/actions/activatemtd
diff --git a/.../charms/stupid/actions/get-ssh-public-key → ...arm/builds/mtdvdu/actions/configurebridge b/.../charms/stupid/actions/get-ssh-public-key → ...arm/builds/mtdvdu/actions/configurebridge
diff --git a/...s/interdomainvdu/actions/generate-ssh-key → ...rm/builds/mtdvdu/actions/generate-ssh-key b/...s/interdomainvdu/actions/generate-ssh-key → ...rm/builds/mtdvdu/actions/generate-ssh-key
diff --git a/...interdomainvdu/actions/get-ssh-public-key → .../builds/mtdvdu/actions/get-ssh-public-key b/...interdomainvdu/actions/get-ssh-public-key → .../builds/mtdvdu/actions/get-ssh-public-key
diff --git a/E2E_Interdomain/charms/stupid/actions/reboot → ...TD/charm/builds/mtdvdu/actions/getmtdinfo b/E2E_Interdomain/charms/stupid/actions/reboot → ...TD/charm/builds/mtdvdu/actions/getmtdinfo
diff --git a/..._vnf/charms/interdomainvdu/actions/reboot → ...in+MTD/charm/builds/mtdvdu/actions/reboot b/..._vnf/charms/interdomainvdu/actions/reboot → ...in+MTD/charm/builds/mtdvdu/actions/reboot
diff --git a/...Interdomain/charms/stupid/actions/restart → ...n+MTD/charm/builds/mtdvdu/actions/restart b/...Interdomain/charms/stupid/actions/restart → ...n+MTD/charm/builds/mtdvdu/actions/restart
diff --git a/E2E_Interdomain/charms/stupid/actions/run → ...omain+MTD/charm/builds/mtdvdu/actions/run b/E2E_Interdomain/charms/stupid/actions/run → ...omain+MTD/charm/builds/mtdvdu/actions/run
diff --git a/E2E_Interdomain/charms/stupid/actions/start → ...ain+MTD/charm/builds/mtdvdu/actions/start b/E2E_Interdomain/charms/stupid/actions/start → ...ain+MTD/charm/builds/mtdvdu/actions/start
diff --git a/E2E_Interdomain/charms/stupid/actions/stop → ...main+MTD/charm/builds/mtdvdu/actions/stop b/E2E_Interdomain/charms/stupid/actions/stop → ...main+MTD/charm/builds/mtdvdu/actions/stop
diff --git a/E2E_Interdomain/charms/stupid/actions/touch → ...ain+MTD/charm/builds/mtdvdu/actions/touch b/E2E_Interdomain/charms/stupid/actions/touch → ...ain+MTD/charm/builds/mtdvdu/actions/touch
diff --git a/...Interdomain/charms/stupid/actions/upgrade → ...n+MTD/charm/builds/mtdvdu/actions/upgrade b/...Interdomain/charms/stupid/actions/upgrade → ...n+MTD/charm/builds/mtdvdu/actions/upgrade
diff --git a/...rms/stupid/actions/verify-ssh-credentials → ...lds/mtdvdu/actions/verify-ssh-credentials b/...rms/stupid/actions/verify-ssh-credentials → ...lds/mtdvdu/actions/verify-ssh-credentials
diff --git a/...l_vnf/charms/interdomainvdu/bin/charm-env → ...ain+MTD/charm/builds/mtdvdu/bin/charm-env b/...l_vnf/charms/interdomainvdu/bin/charm-env → ...ain+MTD/charm/builds/mtdvdu/bin/charm-env
diff --git a/...nf/charms/interdomainvdu/bin/layer_option → ...+MTD/charm/builds/mtdvdu/bin/layer_option b/...nf/charms/interdomainvdu/bin/layer_option → ...+MTD/charm/builds/mtdvdu/bin/layer_option