commit c535b6756680cd7b1fa271a72fadefaa1815aa69
author Andrea Campanella <andrea@opennetworking.org> Mon Feb 25 16:25:35 2019 +0100
committer Andrea Campanella <andrea@opennetworking.org> Tue Feb 26 09:45:08 2019 +0000
tree 6efe621b0bc7f643be4f8afb00d7e4c5e1a8b18e
parent 6b5d4fd1b844998219c7b5e71f08079795430fb7

Fix for Netconf device re-connection.
Unproprer issuing of Device_UNREGISTERED event was causing incorrect device
removal during session re-establishment.
Unconsistent state in ports and links resulted.

Change-Id: Ie07d9077ff0b197a1cb8936b1f307807fae34aeb

apps/odtn/api/src/test/resources/openconfig-device-link.json

diff --git a/apps/odtn/api/src/test/resources/openconfig-device-link.json b/apps/odtn/api/src/test/resources/openconfig-device-link.json
new file mode 100644
index 0000000..9cbc0e3
--- /dev/null
+++ b/apps/odtn/api/src/test/resources/openconfig-device-link.json
@@ -0,0 +1,46 @@
+{
+  "links": {
+    "netconf:127.0.0.1:11002/201-netconf:127.0.0.1:11003/201": {
+      "basic": {
+        "type": "OPTICAL",
+        "metric": 1,
+        "durable": true
+      }
+    },
+    "netconf:127.0.0.1:11002/202-netconf:127.0.0.1:11003/202": {
+      "basic": {
+        "type": "OPTICAL",
+        "metric": 1,
+        "durable": true
+      }
+    },
+    "netconf:127.0.0.1:11002/203-netconf:127.0.0.1:11003/203": {
+      "basic": {
+        "type": "OPTICAL",
+        "metric": 1,
+        "durable": true
+      }
+    },
+    "netconf:127.0.0.1:11002/204-netconf:127.0.0.1:11003/204": {
+      "basic": {
+        "type": "OPTICAL",
+        "metric": 1,
+        "durable": true
+      }
+    },
+    "netconf:127.0.0.1:11002/205-netconf:127.0.0.1:11003/205": {
+      "basic": {
+        "type": "OPTICAL",
+        "metric": 1,
+        "durable": true
+      }
+    },
+    "netconf:127.0.0.1:11002/206-netconf:127.0.0.1:11003/206": {
+      "basic": {
+        "type": "OPTICAL",
+        "metric": 1,
+        "durable": true
+      }
+    }
+  }
+}
\ No newline at end of file

apps/odtn/api/src/test/resources/openconfig-devices.json

diff --git a/apps/odtn/api/src/test/resources/openconfig-devices.json b/apps/odtn/api/src/test/resources/openconfig-devices.json
index 95cc10b..12ef321 100644
--- a/apps/odtn/api/src/test/resources/openconfig-devices.json
+++ b/apps/odtn/api/src/test/resources/openconfig-devices.json
@@ -2,7 +2,7 @@
   "devices" : {
     "netconf:127.0.0.1:11002" : {
       "basic" : {
-        "driver":"infinera-xt3300"
+        "driver":"cassini-ocnos"
       },
       "netconf" : {
         "ip" : "127.0.0.1",
@@ -13,7 +13,7 @@
     },
     "netconf:127.0.0.1:11003" : {
       "basic" : {
-        "driver":"infinera-xt3300"
+        "driver":"cassini-ocnos"
       },
       "netconf" : {
         "ip" : "127.0.0.1",
@@ -23,4 +23,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}