Updates to enable local HTTPS testing

Issue-ID: OPTFRA-391
Change-Id: I4826a4ecc7f33d7062f3cd2850c349fbc4f1ec84
Signed-off-by: Jerry Flood <jflood@att.com>

5 files changed, 17 insertions, 8 deletions

diff --git a/cmso-service/etc/config/optimizer.properties b/cmso-service/etc/config/optimizer.properties
index aa79e8a..26ea4ec 100644
--- a/cmso-service/etc/config/optimizer.properties
+++ b/cmso-service/etc/config/optimizer.properties
@@ -35,6 +35,10 @@
 #cmso.optimizer.health.url=http://localhost:8080/cmso/v1/loopbacktest/optimize/schedule/health

 

 ## Local optimizer service

-cmso.optimizer.request.url=http://127.0.0.1:7997/optimizer/v1/optimize/schedule

-cmso.optimizer.status.url=http://127.0.0.1:7997/optimizer/v1/optimize/schedule

-cmso.optimizer.health.url=http://127.0.0.1:7997/optimizer/v1/health?checkInterfaces=true

+##

+## Update etc/hosts to match. Will work with https configured. 

+## 127.0.0.1 oof-cmso-ticketmgt oof-cmso-topology oof-cmso-optimizer oof-cmso

+##

+cmso.optimizer.request.url=https://oof-cmso-optimizer:7997/optimizer/v1/optimize/schedule

+cmso.optimizer.status.url=https://oof-cmso-optimizer:7997/optimizer/v1/optimize/schedule

+cmso.optimizer.health.url=https://oof-cmso-optimizer:7997/optimizer/v1/health?checkInterfaces=true

diff --git a/cmso-service/etc/config/org.onap.oof.jks b/cmso-service/etc/config/org.onap.oof.jks
new file mode 100644
index 0000000..535abaa
--- /dev/null
+++ b/cmso-service/etc/config/org.onap.oof.jks
diff --git a/cmso-service/etc/config/ticketmgt.properties b/cmso-service/etc/config/ticketmgt.properties
index 88db1ee..7758c12 100644
--- a/cmso-service/etc/config/ticketmgt.properties
+++ b/cmso-service/etc/config/ticketmgt.properties
@@ -29,10 +29,15 @@
 # limitations under the License.

 #-------------------------------------------------------------------------------

 

+##

+## Update etc/hosts to match. Will work with https configured 

+## 127.0.0.1 oof-cmso-ticketmgt oof-cmso-topology oof-cmso-optimizer oof-cmso

+##

+

 tm.vnfs.per.ticket=1

-tm.getPath=http://localhost:8080/cmso/v1/tm/getChangeRecord

-tm.createPath=http://localhost:8080/cmso/v1/tm/createChangeRecord

-tm.closePath=http://localhost:8080/cmso/v1/tm/closeCancelChangeRecord

-tm.updatePath=http://localhost:8080/cmso/v1/tm/updateChangeRecord

+tm.getPath=https://oof-cmso:8080/cmso/v1/tm/getChangeRecord

+tm.createPath=https://oof-cmso:8080/cmso/v1/tm/createChangeRecord

+tm.closePath=https://oof-cmso:8080/cmso/v1/tm/closeCancelChangeRecord

+tm.updatePath=https://oof-cmso:8080/cmso/v1/tm/updateChangeRecord

 tm.approvalStatus=Approved|Scheduled,Approved|Assigned

 tm.template.folder=data/templates/tm

diff --git a/cmso-service/etc/config/truststoreONAPall.jks b/cmso-service/etc/config/truststoreONAPall.jks
new file mode 100644
index 0000000..ff844b1
--- /dev/null
+++ b/cmso-service/etc/config/truststoreONAPall.jks
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java b/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java
index e3974cd..6d8436c 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java
@@ -413,7 +413,7 @@ public class CmsoOptimizerClient {
                     break;
             }
         } catch (Exception e) {
-            Observation.report(LogMessages.UNEXPECTED_EXCEPTION, e.toString());
+            Observation.report(LogMessages.UNEXPECTED_EXCEPTION, e, e.toString());
             hcc.setStatus(e.toString());
         } finally {
             Mdc.restore(mdcSave);