From 7d79d1126137be3559815f00fb7a316eadd759e4 Mon Sep 17 00:00:00 2001
From: Norm Traxler <normant@amdocs.com>
Date: Thu, 29 Nov 2018 19:23:56 +0000
Subject: [PATCH] Network Discovery OOM changes

Issue-ID: SDNC-533
Change Pomba OOM install to use latest Network Discovery code.

Change-Id: I8f2b07f1ab8180ca74d935e55f11e9705f283148
Signed-off-by: Norm Traxler <normant@amdocs.com>
---
 .../resources/config/application.properties        |  27 ++++++++-------------
 .../resources/config/auth/client-cert-onap.p12     | Bin 0 -> 2556 bytes
 .../resources/config/auth/enricher-client-cert.p12 | Bin 2605 -> 0 bytes
 .../templates/deployment.yaml                      |   4 +--
 .../charts/pomba-networkdiscovery/values.yaml      |  19 ++++++++++++---
 5 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12
 delete mode 100644 kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/enricher-client-cert.p12

diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties
index 274a872856..a59cf41b33 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties
@@ -35,20 +35,13 @@ server.context_parameters.p-name=value #context parameter with p-name as key and
 basicAuth.username={{ .Values.config.networkDiscoveryUserId }}
 basicAuth.password={{ .Values.config.networkDiscoveryPassword }}
 
-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 "vserver-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
+openstack.identity.url ={{ .Values.config.openstackIdentityUrl }}
+openstack.identity.user ={{ .Values.config.openstackUserId }}
+openstack.identity.password ={{ .Values.config.openstackPassword }}
+
+openstack.types = vserver, l3-network
+openstack.type.vserver.url    = {{ .Values.config.openstackTypeVserverUrl }}
+openstack.type.l3-network.url = {{ .Values.config.openstackTypeL3NetworkUrl }}
+
+openstack.api.microversion = 2.42
+
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12 b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/client-cert-onap.p12
new file mode 100644
index 0000000000000000000000000000000000000000..dbf4fcacecf190fb0244dce0d1b438e6fea4500d
GIT binary patch
literal 2556
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
F_zSHP#{>WX

literal 0
HcmV?d00001

diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/enricher-client-cert.p12 b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/enricher-client-cert.p12
deleted file mode 100644
index 12e0ae94fad6a3caf00f4547734ecfc708daa76f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2605
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
P{>760nps{i0s;sC^3m4M

diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml
index 7f44106bf9..91b4c5a254 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml
@@ -64,9 +64,9 @@ spec:
             name: {{ include "common.fullname" . }}-config
             subPath: application.properties
             readOnly: true
-          - mountPath: /opt/app/config/auth/enricher-client-cert.p12
+          - mountPath: /opt/app/config/auth/client-cert-onap.p12
             name: {{ include "common.fullname" . }}-auth-secret
-            subPath: enricher-client-cert.p12
+            subPath: client-cert-onap.p12
             readOnly: true
 
           resources:
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
index 0e42192c44..35369e7ba8 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
@@ -24,7 +24,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image:  onap/network-discovery:1.4.2
+image:  onap/network-discovery:latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -38,6 +38,15 @@ config:
   networkDiscoveryUserId: admin
   networkDiscoveryPassword: OBF:1u2a1toa1w8v1tok1u30
 
+  # Basic Authorization credentials for Openstack Rest APIs
+  openstackIdentityUrl: http://10.69.36.11:5000/v3/auth/tokens
+  openstackUserId: admin
+  openstackPassword: OBF:1w951ugg1vun1uha1w8l
+
+  # Openstack Rest API URLs:
+  openstackTypeVserverUrl: http://10.69.36.11:8774/v2.1/servers/{0}
+  openstackTypeL3NetworkUrl: http://10.69.36.11:9696/v2.0/networks/{0}
+
 # default number of instances
 replicaCount: 1
 
@@ -66,9 +75,11 @@ service:
 
   #Services may use any combination of ports depending on the 'type' of
   #service being defined.
-  type: ClusterIP
-  externalPort: 9531
+  type: NodePort
+  name: pomba-networkdiscovery  
+  externalPort: 8080
   internalPort: 8080
+  nodePort: 99
 #  nodePort: <replace with unused node port suffix eg. 23>
   # optional port name override - default can be defined in service.yaml
   #portName: http
@@ -94,4 +105,4 @@ resources:
     requests:
       cpu: 20m
       memory: 800Mi
-  unlimited: {}
\ No newline at end of file
+  unlimited: {}
-- 
2.16.6