From 893e2ff0fe4f605b5ce6f709c6fab8fe65d242f5 Mon Sep 17 00:00:00 2001
From: Norm Traxler <normant@amdocs.com>
Date: Wed, 30 Jan 2019 14:53:39 +0000
Subject: Network Discovery support for network

Issue-ID: SDNC-475
Add support for Openstack network object retrieval.
Moved the attribute translations into Jolt transformations.

Change-Id: I442bfe39a5b84050d7a7fa8b50aaf831e4dd05d0
Signed-off-by: Norm Traxler <normant@amdocs.com>
---
 .../test/resources/jolt/l3network-expected.json    | 51 ++++++++++----
 .../src/test/resources/jolt/vserver-expected.json  | 80 ++++++++++++++++++----
 2 files changed, 105 insertions(+), 26 deletions(-)

(limited to 'pomba/network-discovery/src/test/resources/jolt')

diff --git a/pomba/network-discovery/src/test/resources/jolt/l3network-expected.json b/pomba/network-discovery/src/test/resources/jolt/l3network-expected.json
index be4ad9d..e9e37dd 100644
--- a/pomba/network-discovery/src/test/resources/jolt/l3network-expected.json
+++ b/pomba/network-discovery/src/test/resources/jolt/l3network-expected.json
@@ -1,14 +1,39 @@
 {
-	"l3-network": {
-		"id": "8df84f0a-737a-4628-be9c-c3c78454f9d9",
-		"name": "NET_503",
-		"AdminState": true,
-		"sharedNetwork": true,
-		"status": "ACTIVE",
-		"subnets": [
-			"d0e6ecad-7bc9-4138-b9e8-e742bdf9afd5"
-		],
-		"tenantId": "c44b872f6830498b88c4989d67b2a6b7",
-		"host-status": "UNKNOWN"
-	}
-}
+  "id" : "8df84f0a-737a-4628-be9c-c3c78454f9d9",
+  "name" : "NET_503",
+  "type" : "l3-network",
+  "dataQuality" : {
+    "status" : "ok"
+  },
+  "attributeList" : [ {
+    "name" : "adminState",
+    "value" : "true",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "sharedNetwork",
+    "value" : "true",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "status",
+    "value" : "ACTIVE",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "subnets",
+    "value" : "d0e6ecad-7bc9-4138-b9e8-e742bdf9afd5",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "tenantId",
+    "value" : "c44b872f6830498b88c4989d67b2a6b7",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  } ]
+}
\ No newline at end of file
diff --git a/pomba/network-discovery/src/test/resources/jolt/vserver-expected.json b/pomba/network-discovery/src/test/resources/jolt/vserver-expected.json
index 53d4a79..2ad9f81 100644
--- a/pomba/network-discovery/src/test/resources/jolt/vserver-expected.json
+++ b/pomba/network-discovery/src/test/resources/jolt/vserver-expected.json
@@ -1,15 +1,69 @@
 {
-  "vserver" : {
-    "id" : "2c311eae-f542-4173-8a01-582922abd495",
-    "name" : "norm_bouygues",
-    "inMaintenance" : true,
-    "hostname" : "norm-bouygues",
-    "imageId" : "c0022890-d91f-422c-91c5-3866edeae768",
-    "status" : "ACTIVE",
-    "vmState" : "active",
-    "tenantId" : "15ad36d394e744838e947ca90609f805",
-    "hostId" : "ea1660efbbedda164379afacdc622305c4b88cebfb84119472d286a8",
-    "host" : "Setup-NCSO-OTT-E-C2",
-    "hostStatus" : "UP"
-  }
+  "id" : "2c311eae-f542-4173-8a01-582922abd495",
+  "name" : "norm_bouygues",
+  "type" : "vserver",
+  "dataQuality" : {
+    "status" : "ok"
+  },
+  "attributeList" : [ {
+    "name" : "inMaintenance",
+    "value" : "true",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "hostname",
+    "value" : "norm-bouygues",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "imageId",
+    "value" : "c0022890-d91f-422c-91c5-3866edeae768",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "status",
+    "value" : "ACTIVE",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "vmState",
+    "value" : "active",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "userId",
+    "value" : "bdaf4fcde1574450bfa488b3221033d8",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "tenantId",
+    "value" : "15ad36d394e744838e947ca90609f805",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "hostId",
+    "value" : "ea1660efbbedda164379afacdc622305c4b88cebfb84119472d286a8",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "host",
+    "value" : "Setup-NCSO-OTT-E-C2",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  }, {
+    "name" : "hostStatus",
+    "value" : "UP",
+    "dataQuality" : {
+      "status" : "ok"
+    }
+  } ]
 }
\ No newline at end of file
-- 
cgit 1.2.3-korg