From 0d920e8d8e85f712dd1799f8682357afe43819e3 Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Tue, 30 Apr 2019 13:31:09 -0400 Subject: Updates to enable local HTTPS testing Issue-ID: OPTFRA-391 Change-Id: I4826a4ecc7f33d7062f3cd2850c349fbc4f1ec84 Signed-off-by: Jerry Flood --- cmso-optimizer/etc/config/optimizer.properties | 20 +++++++++++++------- cmso-optimizer/etc/config/org.onap.oof.jks | Bin 0 -> 3711 bytes cmso-optimizer/etc/config/truststoreONAPall.jks | Bin 0 -> 117990 bytes cmso-service/etc/config/optimizer.properties | 10 +++++++--- cmso-service/etc/config/org.onap.oof.jks | Bin 0 -> 3711 bytes cmso-service/etc/config/ticketmgt.properties | 13 +++++++++---- cmso-service/etc/config/truststoreONAPall.jks | Bin 0 -> 117990 bytes .../optf/cmso/optimizer/CmsoOptimizerClient.java | 2 +- cmso-ticketmgt/etc/config/org.onap.oof.jks | Bin 0 -> 3711 bytes cmso-ticketmgt/etc/config/truststoreONAPall.jks | Bin 0 -> 117990 bytes cmso-topology/etc/config/org.onap.oof.jks | Bin 0 -> 3711 bytes cmso-topology/etc/config/truststoreONAPall.jks | Bin 0 -> 117990 bytes 12 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 cmso-optimizer/etc/config/org.onap.oof.jks create mode 100644 cmso-optimizer/etc/config/truststoreONAPall.jks create mode 100644 cmso-service/etc/config/org.onap.oof.jks create mode 100644 cmso-service/etc/config/truststoreONAPall.jks create mode 100644 cmso-ticketmgt/etc/config/org.onap.oof.jks create mode 100644 cmso-ticketmgt/etc/config/truststoreONAPall.jks create mode 100644 cmso-topology/etc/config/org.onap.oof.jks create mode 100644 cmso-topology/etc/config/truststoreONAPall.jks diff --git a/cmso-optimizer/etc/config/optimizer.properties b/cmso-optimizer/etc/config/optimizer.properties index 132408e..9e089fe 100644 --- a/cmso-optimizer/etc/config/optimizer.properties +++ b/cmso-optimizer/etc/config/optimizer.properties @@ -43,20 +43,26 @@ logging.level.org.hibernate.SQL=WARN logging.level.org.hibernate=WARN -healthcheck.cmso.topology.url=http://127.0.0.1:7998/topology/v1/health?checkInterfaces=true -healthcheck.cmso.ticketmgt.url=http://127.0.0.1:7999/ticketmgt/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 +## +healthcheck.cmso.topology.url=https://oof-cmso-topology:7998/topology/v1/health?checkInterfaces=true +healthcheck.cmso.ticketmgt.url=https://oof-cmso-ticketmgt:7999/ticketmgt/v1/health?checkInterfaces=true healthcheck.cmso.topology.title="CMSO Topology Interface" healthcheck.cmso.ticketmgt.title="CMSO Ticket Management Interface" -cmso.topology.create.request.url=http://127.0.0.1:7998/topology/v1/current -cmso.ticket.create.request.url=http://127.0.0.1:7999/ticketmgt/v1/activetickets +cmso.topology.create.request.url=https://oof-cmso-topology:7998/topology/v1/current +cmso.ticket.create.request.url=https://oof-cmso-topology:7999/ticketmgt/v1/activetickets cmso.local.policy.folder=data/policies ## MacOS - minizinc IDE has solvers built in -cmso.minizinc.command.exe=/Applications/MiniZincIDE.app/Contents/Resources/minizinc +##cmso.minizinc.command.exe=/Applications/MiniZincIDE.app/Contents/Resources/minizinc + ## Windows -##cmso.minizinc.command.exe="C:/Program Files/MiniZinc IDE (bundled)/minizinc.exe" +cmso.minizinc.command.exe="C:/Program Files/MiniZinc IDE (bundled)/minizinc.exe" +cmso.minizinc.command.commandline=cmd.exe /C scripts\\minizinc\\run.bat + cmso.minizinc.command.solver=OSICBC cmso.minizinc.command.timelimit=60000 cmso.minizinc.command.mzn=scripts/minizinc/generic_attributes.mzn -###cmso.minizinc.command.commandline=cmd.exe /C scripts\\minizinc\\run.bat \ No newline at end of file diff --git a/cmso-optimizer/etc/config/org.onap.oof.jks b/cmso-optimizer/etc/config/org.onap.oof.jks new file mode 100644 index 0000000..535abaa Binary files /dev/null and b/cmso-optimizer/etc/config/org.onap.oof.jks differ diff --git a/cmso-optimizer/etc/config/truststoreONAPall.jks b/cmso-optimizer/etc/config/truststoreONAPall.jks new file mode 100644 index 0000000..ff844b1 Binary files /dev/null and b/cmso-optimizer/etc/config/truststoreONAPall.jks differ 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 Binary files /dev/null and b/cmso-service/etc/config/org.onap.oof.jks differ 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 Binary files /dev/null and b/cmso-service/etc/config/truststoreONAPall.jks differ 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); diff --git a/cmso-ticketmgt/etc/config/org.onap.oof.jks b/cmso-ticketmgt/etc/config/org.onap.oof.jks new file mode 100644 index 0000000..535abaa Binary files /dev/null and b/cmso-ticketmgt/etc/config/org.onap.oof.jks differ diff --git a/cmso-ticketmgt/etc/config/truststoreONAPall.jks b/cmso-ticketmgt/etc/config/truststoreONAPall.jks new file mode 100644 index 0000000..ff844b1 Binary files /dev/null and b/cmso-ticketmgt/etc/config/truststoreONAPall.jks differ diff --git a/cmso-topology/etc/config/org.onap.oof.jks b/cmso-topology/etc/config/org.onap.oof.jks new file mode 100644 index 0000000..535abaa Binary files /dev/null and b/cmso-topology/etc/config/org.onap.oof.jks differ diff --git a/cmso-topology/etc/config/truststoreONAPall.jks b/cmso-topology/etc/config/truststoreONAPall.jks new file mode 100644 index 0000000..ff844b1 Binary files /dev/null and b/cmso-topology/etc/config/truststoreONAPall.jks differ -- cgit 1.2.3-korg