5 files changed, 85 insertions, 17 deletions
diff --git a/pomba/network-discovery/config/application.properties b/pomba/network-discovery/config/application.properties
index 6dba59d..f6a889e 100644
--- a/pomba/network-discovery/config/application.properties
+++ b/pomba/network-discovery/config/application.properties
@@ -22,20 +22,13 @@ server.context_parameters.p-name=value #context parameter with p-name as key and
 basicAuth.username=admin
 basicAuth.password=OBF:1u2a1toa1w8v1tok1u30
 
-enricher.types = vserver, l3-network
-enricher.type.vserver.url    = /enricher/v11/cloud-infrastructure/vservers/vserver/{0}?sot=!aai
-enricher.type.l3-network.url = /enricher/v11/network/l3-networks/l3-network/{0}?sot=!aai
-
-# Mapping from Enricher Attribute name to POMBA Attribute name in the format
-#   <Enricher Attribute Name>:<Pomba Attribute Name>;  and separated by semicolon ";"
-# for example,
-#          vserser-id:id;
-# means Attribute name "vserer-id" from Enricher will be converted to "id" in POMBA.
-enricher.attributeNameMappingList=Id:id;id:id;vserver-id:id;name:name;locked:inMaintenance; \
-            hostname:hostName;status:status;vm_state:vmState;vm-state:vmState;admin_state_up:adminState; \
-            favor.disk:flavorDisk;flavor.ephemeral:flavorEphemoral;flavor.extra_specs.hw.cpu_model:flavorHwCpuModel; \
-            flavor.extra_specs.hw.cpu_policy:flavorHwCpuPolicy;flavor.extra_specs.hw.mem_page_size:flavorHwMemPageSize; \
-            flavor.original_name:flavorOriginalName;flavor.ram:flavorRam;flavor.swap:flavorSwag;flavorvcpus:flavorVcpus; \
-            image.id:imageId;hostId:hostId;host:host;host_status:hostStatus;security_group.name:securityGroupName; \
-            serverName:serverName;metadata.myservername:otherServerName;shared:sharedNetwork;subnets:subnets; \
-            userId:userId;tenant_id:tenantId
-\ No newline at end of file
+openstack.identity.url = http://10.69.36.11:5000/v3/auth/tokens
+openstack.identity.user = ralph
+openstack.identity.password = OBF:1w951ugg1vun1uha1w8l
+
+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.api.microversion = 2.42
+
diff --git a/pomba/network-discovery/config/auth/client-cert-onap.p12 b/pomba/network-discovery/config/auth/client-cert-onap.p12
new file mode 100644
index 0000000..dbf4fca
--- /dev/null
+++ b/pomba/network-discovery/config/auth/client-cert-onap.p12
diff --git a/pomba/network-discovery/config/auth/osauth.json b/pomba/network-discovery/config/auth/osauth.json
new file mode 100644
index 0000000..95dec53
--- /dev/null
+++ b/pomba/network-discovery/config/auth/osauth.json
@@ -0,0 +1,18 @@
+{
+    "auth": {
+        "identity": {
+            "methods": [
+                "password"
+            ],
+            "password": {
+                "user": {
+                    "name": "%USER%",
+                    "domain": {
+                        "name": "Default"
+                    },
+                    "password": "%PASSWORD%"
+                }
+            } 
+        }
+    }
+}
+\ No newline at end of file
diff --git a/pomba/network-discovery/config/jolt/l3-network.json b/pomba/network-discovery/config/jolt/l3-network.json
new file mode 100644
index 0000000..0afe4a2
--- /dev/null
+++ b/pomba/network-discovery/config/jolt/l3-network.json
@@ -0,0 +1,25 @@
+[
+  {
+    "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"
+      }
+    }
+  },
+  {
+    "operation": "default",
+    "spec": {
+      "*": {
+        "host-status": "UNKNOWN"
+      }
+    }
+  }
+
+]
diff --git a/pomba/network-discovery/config/jolt/vserver.json b/pomba/network-discovery/config/jolt/vserver.json
new file mode 100644
index 0000000..cc9e26d
--- /dev/null
+++ b/pomba/network-discovery/config/jolt/vserver.json
@@ -0,0 +1,32 @@
+[
+  {
+    "operation": "shift",
+    "spec": {
+      "server": {
+        "id": "vserver.id",
+        "name": "vserver.name",
+        "locked":  "vserver.inMaintenance",
+        "OS-EXT-SRV-ATTR:hostname":  "vserver.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"
+      }
+    }
+  },
+  {
+    "operation": "default",
+    "spec": {
+      "*": {
+        "hostStatus": "UNKNOWN"
+      }
+    }
+  }
+
+]