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>

3 files changed, 62 insertions, 37 deletions

diff --git a/pomba/network-discovery/config/application.properties b/pomba/network-discovery/config/application.properties
index 1032d42..b7d41b7 100644
--- a/pomba/network-discovery/config/application.properties
+++ b/pomba/network-discovery/config/application.properties
@@ -15,13 +15,13 @@ server.ssl.enabled-protocols=TLSv1.1,TLSv1.2
 basicAuth.username=admin
 basicAuth.password=OBF:1u2a1toa1w8v1tok1u30
 
-openstack.identity.url = http://10.69.36.11:5000/v3/auth/tokens
-openstack.identity.user = ralph
-openstack.identity.password = OBF:1w951ugg1vun1uha1w8l
+openstack.identity.url = http://10.69.100.11:5000/v3/auth/tokens
+openstack.identity.user = jbalasub
+openstack.identity.password = OBF:1thj1vn01v1p1toq1to41v2p1vo21th3
 
 openstack.types = vserver, l3-network
-openstack.type.vserver.url    = http://10.69.36.11:8774/v2.1/servers/{0}
-openstack.type.l3-network.url = http://10.69.36.11:9696/v2.0/networks/{0}
+openstack.type.vserver.url    = http://10.69.100.11:8774/v2.1/servers/{0}
+openstack.type.l3-network.url = http://10.69.100.11:9696/v2.0/networks/{0}
 
 openstack.api.microversion = 2.42
 
diff --git a/pomba/network-discovery/config/jolt/l3-network.json b/pomba/network-discovery/config/jolt/l3-network.json
index 0afe4a2..77fa4aa 100644
--- a/pomba/network-discovery/config/jolt/l3-network.json
+++ b/pomba/network-discovery/config/jolt/l3-network.json
@@ -3,23 +3,36 @@
     "operation": "shift",
     "spec": {
       "network": {
-        "id": "l3-network.id",
-        "name": "l3-network.name",
-        "admin_state_up": "l3-network.AdminState",
-        "shared": "l3-network.sharedNetwork",
-        "status": "l3-network.status",
-        "subnets": "l3-network.subnets",
-        "tenant_id": "l3-network.tenantId"
+        "id": "id",
+        "name": "name",
+        "admin_state_up": "tempList[].adminState",
+        "shared": "tempList[].sharedNetwork",
+        "status": "tempList[].status",
+        "subnets" : {
+          "*": "tempList[].subnets"
+         },
+        "tenant_id" : "tempList[].tenantId"
       }
     }
   },
   {
-    "operation": "default",
+    "operation": "shift",
     "spec": {
+      "tempList": {
+        "*": {
+        	"*" : {
+        	   "$": "attributeList[#3].name",
+        	   "@": "attributeList[#3].value"
+        	},
+        	"#ok": "attributeList[#2].dataQuality.status"
+        }
+      },
       "*": {
-        "host-status": "UNKNOWN"
-      }
-    }
-  }
+         "@" : "&"
+      },
+      "#l3-network": "type",
+      "#ok": "dataQuality.status"
+     }
+   }
 
-]
+]
\ No newline at end of file
diff --git a/pomba/network-discovery/config/jolt/vserver.json b/pomba/network-discovery/config/jolt/vserver.json
index cc9e26d..1363be9 100644
--- a/pomba/network-discovery/config/jolt/vserver.json
+++ b/pomba/network-discovery/config/jolt/vserver.json
@@ -3,30 +3,42 @@
     "operation": "shift",
     "spec": {
       "server": {
-        "id": "vserver.id",
-        "name": "vserver.name",
-        "locked":  "vserver.inMaintenance",
-        "OS-EXT-SRV-ATTR:hostname":  "vserver.hostname",
+        "id": "id",
+        "name": "name",
+        "locked":   "tempList[].inMaintenance",
+        "OS-EXT-SRV-ATTR:hostname": "tempList[].hostname",
         "image": {
-            "id": "vserver.imageId"
-        },
-        
-        "status": "vserver.status",
-        "OS-EXT-STS:vm_state": "vserver.vmState",
-        "tenant_id": "vserver.tenantId",
-        "hostId": "vserver.hostId",
-        "OS-EXT-SRV-ATTR:host": "vserver.host",      
-        "host_status": "vserver.hostStatus"
+          "id": "tempList[].imageId"
+         },
+        "status":  "tempList[].status",
+        "OS-EXT-STS:vm_state" : "tempList[].vmState",
+        "user_id" : "tempList[].userId",
+        "tenant_id" : "tempList[].tenantId",
+        "hostId" : "tempList[].hostId",
+        "OS-EXT-SRV-ATTR:host" : "tempList[].host",
+        "host_status" : "tempList[].hostStatus"
       }
     }
-  },
+  }
+  ,
   {
-    "operation": "default",
+    "operation": "shift",
     "spec": {
+      "tempList": {
+        "*": {
+        	"*" : {
+        	   "$": "attributeList[#3].name",
+        	   "@": "attributeList[#3].value"
+        	},
+        	"#ok": "attributeList[#2].dataQuality.status"
+        }
+      },
       "*": {
-        "hostStatus": "UNKNOWN"
-      }
-    }
-  }
+         "@" : "&"
+      },
+      "#vserver": "type",
+      "#ok": "dataQuality.status"
+     }
+   }
 
 ]