Merge "Fix SO Healthcheck"

4 files changed, 194 insertions, 37 deletions

diff --git a/kubernetes/so/resources/config/mso/mso-docker.json b/kubernetes/so/resources/config/mso/mso-docker.json
index 17f01931a6..92988ba2f0 100755
--- a/kubernetes/so/resources/config/mso/mso-docker.json
+++ b/kubernetes/so/resources/config/mso/mso-docker.json
@@ -9,9 +9,9 @@
 
     "mso-api-handler-infra-config":
     {
-      "bpelURL": "http://so:8080",
+      "bpelURL": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}",
       "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
-      "camundaURL": "http://so:8080",
+      "camundaURL": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}",
       "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
     },
 
@@ -23,7 +23,7 @@
         "consumerGroup": "sdc-OpenSource-Env1",
         "consumerId": "sdc-COpenSource-Env11",
         "environmentName": "{{ .Values.config.dmaapTopic }}",
-        "asdcAddress": "sdc-be:8443",
+        "asdcAddress": "{{.Values.config.sdc.serviceName}}:{{.Values.config.sdc.port}}",
         "password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247",
         "pollingInterval": 60,
         "pollingTimeout": 60,
@@ -38,20 +38,20 @@
     {
       "sdncurls":
       [
-        "http://sdnhost:8282/restconf/operations/L3SDN-API:",
-        "http://sdnhost:8282/restconf/config/L3SDN-API:",
-        "http://sdnhost:8282/restconf/operations/Firewall-API:",
-        "http://sdnhost:8282/restconf/config",
-        "http://sdnhost:8282/restconf/operations/VNF-API:",
-        "http://sdnhost:8282/restconf/operations/NBNC-API:",
-        "http://sdnhost:8282/restconf/operations/NORTHBOUND-API:service-topology-operation",
-        "http://sdnhost:8282/restconf/operations/GENERIC-RESOURCE-API:",
-        "http://sdnhost:8282/restconf/operations/VNFTOPOLOGYAIC-API:"
+        "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/L3SDN-API:",
+        "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/config/L3SDN-API:",
+        "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/Firewall-API:",
+        "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/config",
+        "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/VNF-API:",
+        "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/NBNC-API:",
+        "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/NORTHBOUND-API:service-topology-operation",
+        "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/GENERIC-RESOURCE-API:",
+        "http://{{.Values.config.sdnc.serviceName}}:{{.Values.config.sdnc.port}}/restconf/operations/VNFTOPOLOGYAIC-API:"
       ],
 
-      "bpelurl": "http://so:8080/mso/SDNCAdapterCallbackService",
-      "restbpelurl": "http://so:8080/mso/WorkflowMessage",
-      "myurl": "http://so:8080/adapters/rest/SDNCNotify",
+      "bpelurl": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/SDNCAdapterCallbackService",
+      "restbpelurl": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/WorkflowMessage",
+      "myurl": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/adapters/rest/SDNCNotify",
       "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73",
       "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
       "sdncconnecttime": "5000"
@@ -92,7 +92,7 @@
 
     "mso-workflow-message-adapter-config":
     {
-      "wmbpelurl": "http://so:8080/mso/WorkflowMessage",
+      "wmbpelurl": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/WorkflowMessage",
       "wmbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
     },
 
@@ -128,37 +128,37 @@
       "versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44",
       "infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77",
       "sniroAuth": "test:testpwd",
-      "sniroEndpoint": "http://sniro-emulator:8080/sniro/api/v2/placement",
+      "sniroEndpoint": "http://{{.Values.config.sniro.serviceName}}:{{.Values.config.sniro.port}}/sniro/api/v2/placement",
       "sniroTimeout": "PT30M",
-      "serviceAgnosticSniroHost": "http://sniro-emulator:8080",
+      "serviceAgnosticSniroHost": "http://{{.Values.config.sniro.serviceName}}:{{.Values.config.sniro.port}}",
       "serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement",
-      "aaiEndpoint": "https://aai-service:8443",
+      "aaiEndpoint": "https://{{.Values.config.aai.serviceName}}:{{.Values.config.aai.port}}",
       "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
       "adaptersNamespace": "http://org.openecomp.mso",
-      "adaptersCompletemsoprocessEndpoint": "http://so:8080/CompleteMsoProcess",
-      "adaptersDbEndpoint": "http://so:8080/dbadapters/MsoRequestsDbAdapter",
-      "adaptersOpenecompDbEndpoint": "http://so:8080/dbadapters/RequestsDbAdapter",
-      "catalogDbEndpoint": "http://so:8080/ecomp/mso/catalog",
-      "adaptersSdncEndpoint": "http://so:8080/adapters/SDNCAdapter",
-      "adaptersSdncRestEndpoint": "http://so:8080/adapters/rest/v1/sdnc",
-      "adaptersTenantEndpoint": "http://so:8080/tenants/TenantAdapter",
+      "adaptersCompletemsoprocessEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/CompleteMsoProcess",
+      "adaptersDbEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/dbadapters/MsoRequestsDbAdapter",
+      "adaptersOpenecompDbEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/dbadapters/RequestsDbAdapter",
+      "catalogDbEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/ecomp/mso/catalog",
+      "adaptersSdncEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/adapters/SDNCAdapter",
+      "adaptersSdncRestEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/adapters/rest/v1/sdnc",
+      "adaptersTenantEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/tenants/TenantAdapter",
       "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
-      "adaptersWorkflowMessageEndpoint": "http://so:8080/workflows/messages/message",
-      "workflowMessageEndpoint": "http://so:8080/mso/WorkflowMessage",
-      "workflowSdncAdapterCallback": "http://so:8080/mso/SDNCAdapterCallbackService",
+      "adaptersWorkflowMessageEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/workflows/messages/message",
+      "workflowMessageEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/WorkflowMessage",
+      "workflowSdncAdapterCallback": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/SDNCAdapterCallbackService",
       "workflowSdncReplicationDelay": "PT5S",
       "workflowAaiDistributionDelay": "PT30S",
       "msoKey": "07a7159d3bf51a0e53be7a8f89699be7",
       "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
       "sdncTimeout": "PT5M",
       "rollback": "true",
-      "adaptersNetworkEndpoint": "http://so:8080/networks/NetworkAdapter",
-      "adaptersNetworkRestEndpoint": "http://so:8080/networks/rest/v1/networks",
-      "adaptersVnfAsyncEndpoint": "http://so:8080/vnfs/VnfAdapterAsync",
-      "workflowVnfAdapterDeleteCallback": "http://so:8080/mso/vnfAdapterNotify",
-      "workflowVnfAdapterCreateCallback": "http://so:8080/mso/vnfAdapterNotify",
-      "adaptersVnfRestEndpoint": "http://so:8080/vnfs/rest/v1/vnfs",
-      "workflowVnfAdapterRestCallback": "http://so:8080/mso/vnfAdapterRestNotify",
+      "adaptersNetworkEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/networks/NetworkAdapter",
+      "adaptersNetworkRestEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/networks/rest/v1/networks",
+      "adaptersVnfAsyncEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/vnfs/VnfAdapterAsync",
+      "workflowVnfAdapterDeleteCallback": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/vnfAdapterNotify",
+      "workflowVnfAdapterCreateCallback": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/vnfAdapterNotify",
+      "adaptersVnfRestEndpoint": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/vnfs/rest/v1/vnfs",
+      "workflowVnfAdapterRestCallback": "http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/vnfAdapterRestNotify",
       "poTimeout": "PT5M",
       "sdncFirewallYangModel": "http://com/att/svc/mis/firewall-lite-gui",
       "sdncFirewallYangModelVersion": "2015-05-15",
@@ -179,4 +179,3 @@
     "mso-config": "~> 1.0.0"
   }
 }
-
diff --git a/kubernetes/so/resources/config/mso/mso.bpmn.urn.properties b/kubernetes/so/resources/config/mso/mso.bpmn.urn.properties
new file mode 100644
index 0000000000..81c21f6ef2
--- /dev/null
+++ b/kubernetes/so/resources/config/mso/mso.bpmn.urn.properties
@@ -0,0 +1,129 @@
+log.debug.asyncQueryAAICustomer=false
+log.debug.ChangeFeatureActivateV1=false
+log.debug.ChangeLayer3ServiceActivateV1=false
+log.debug.CompleteMsoProcess=false
+log.debug.commonCompletion=false
+log.debug.CreateCustomerV1=false
+log.debug.CreateTenantV1=false
+log.debug.DeleteTenantV1=false
+log.debug.deleteVCEV1=false
+log.debug.getLayer3ServiceDetailsV1=false
+log.debug.l3ToHigherLayerAddBonding=false
+log.debug.l3ToHigherLayerDeleteBonding=false
+mso.workflow.l3ToHigherLayerAddBonding.model.invariantid=50359538-066f-4a8d-807f-f2bc8eaa79dc
+mso.workflow.l3ToHigherLayerAddBonding.model.versionid=52dbec20-47aa-42e4-936c-331d8e350d44
+log.debug.Layer3ServiceActivateV1=false
+log.debug.QueryAAICustomer=false
+log.debug.QueryTenantInfo=false
+log.debug.sdncAdapter=false
+log.debug.sendAOTSTicket=false
+log.debug.vnfAdapterCreateV1=false
+log.debug.vnfAdapterDeleteV1=false
+log.debug.RemoveLayer3Service=false
+log.debug.Layer3TestAndTurnUpV1=false
+log.debug.vnfAdapterRollbackV1=false
+log.debug.vnfAdapterQueryV1=false
+log.debug.CreateVfModuleVolume=false
+log.debug.DeleteVfModuleVolume=false
+log.debug.UpdateVfModuleVolume=false
+log.debug.createCinderVolumeV1=false
+log.debug.deleteCinderVolumeV1=false
+log.debug.updateCinderVolumeV1=false
+log.debug.CreateNetworkV2=false
+log.debug.DeleteNetworkV2=false
+log.debug.UpdateNetworkV2=false
+log.debug.deleteGenericVNFV1=false
+log.debug.DisconnectLayer3Service=false
+log.debug.CreateVfModuleVolumeInfraV1=false
+log.debug.DeleteVfModuleVolumeInfraV1=false
+log.debug.UpdateVfModuleVolumeInfraV1=false
+log.debug.CreateServiceInstanceInfra=false
+log.debug.DeleteServiceInstanceInfra=false
+log.debug.CreateNetworkInstanceInfra=false
+log.debug.DeleteNetworkInstanceInfra=false
+log.debug.UpdateNetworkInstanceInfra=false
+log.debug.UpdateNetworkInstance=false
+log.debug.DoUpdateNetworkInstance=false
+log.debug.DoUpdateNetworkInstanceRollback=false
+log.debug.CreateNetworkInstance=false
+log.debug.DoCreateNetworkInstance=false
+log.debug.DoCreateNetworkInstanceRollback=false
+log.debug.DeleteNetworkInstance=false
+log.debug.DoDeleteNetworkInstance=false
+log.debug.DoDeleteNetworkInstanceRollback=false
+log.debug.CreateViprAtmService=false
+log.debug.DeleteViprAtmService=false
+log.debug.GenericGetService=false
+log.debug.GenericPutService=false
+log.debug.GenericDeleteService=false
+log.debug.CreateServiceInstance=false
+log.debug.DelServiceInstance=false
+log.debug.RollbackServiceInstance=false
+log.debug.DoCreateServiceInstanceRollback=false
+log.debug.DoDeleteServiceInstance=false
+log.debug.DoCreateVfModuleVolumeRollback=false
+log.debug.DoDeleteVfModuleVolumeRollback=false
+log.debug.DoDeleteVfModuleVolumeV1=false
+log.debug.DoCreateVfModuleVolumeV1=false
+log.debug.VPECreateVfModule=false
+log.debug.DHVCreateService=false
+log.debug.DHVActivateService=false
+log.debug.SNIROAdapter=
+mso.infra.customer.id=21014aa2-526b-11e6-beb8-9e71128cae77
+mso.sniro.auth=test:testpwd
+mso.sniro.endpoint=http://{{.Values.config.sniro.serviceName}}:{{.Values.config.sniro.port}}/sniro/api/v2/placement
+mso.sniro.timeout=PT30M
+mso.service.agnostic.sniro.host=http://{{.Values.config.sniro.serviceName}}:{{.Values.config.sniro.port}}
+mso.service.agnostic.sniro.endpoint=/sniro/api/v2/placement
+mso.catalog.db.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/ecomp/mso/catalog
+aai.endpoint=https://{{.Values.config.aai.serviceName}}:{{.Values.config.aai.port}}
+mso.adapters.namespace=http://org.openecomp.mso
+mso.adapters.completemsoprocess.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/CompleteMsoProcess
+mso.adapters.db.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/dbadapters/MsoRequestsDbAdapter
+mso.adapters.openecomp.db.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/dbadapters/RequestsDbAdapter
+mso.adapters.sdnc.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/adapters/SDNCAdapter
+mso.adapters.sdnc.rest.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/adapters/rest/v1/sdnc
+mso.adapters.tenant.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/tenants/TenantAdapter
+mso.adapters.workflow.message.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/workflows/messages/message
+mso.adapters.db.auth=6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74
+mso.workflow.message.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/WorkflowMessage
+mso.workflow.sdncadapter.callback=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/SDNCAdapterCallbackService
+mso.workflow.sdnc.replication.delay=PT5S
+mso.workflow.aai.distribution.delay=PT30S
+mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7
+mso.adapters.po.auth=6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74
+mso.sdnc.timeout=PT5M
+mso.rollback=true
+mso.adapters.network.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/networks/NetworkAdapter
+mso.adapters.network.rest.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/networks/rest/v1/networks
+mso.adapters.vnf-async.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/vnfs/VnfAdapterAsync
+mso.workflow.vnfadapter.delete.callback=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/vnfAdapterNotify
+mso.workflow.vnfadapter.create.callback=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/vnfAdapterNotify
+mso.adapters.vnf.rest.endpoint=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/vnfs/rest/v1/vnfs
+mso.po.timeout=PT5M
+mso.sdnc.firewall.yang.model=http://com/att/svc/mis/firewall-lite-gui
+mso.sdnc.firewall.yang.model.version=2015-05-15
+mso.sdnc.timeout.firewall.minutes=20
+mso.callbackRetryAttempts=30
+mso.callbackRetrySleepTime=1000
+mso.use.qualified.host=false
+mso.workflow.l3ToHigherLayerAddBonding.model.name=WAN Bonding
+mso.workflow.l3ToHigherLayerAddBonding.model.version=2.0
+mso.sitename=mso-docker
+mso.workflow.global.default.aai.version=11
+mso.workflow.global.default.aai.namespace=http://org.openecomp.aai.inventory/
+mso.workflow.default.aai.v11.generic-vnf.uri=/aai/v11/network/generic-vnfs/generic-vnf
+mso.workflow.default.aai.v11.vpn-binding.uri=/aai/v11/network/vpn-bindings/vpn-binding
+mso.workflow.default.aai.v11.network-policy.uri=/aai/v11/network/network-policies/network-policy
+mso.workflow.default.aai.v11.route-table-reference.uri=/aai/v11/network/route-table-references/route-table-reference
+mso.workflow.default.aai.v11.vce.uri=/aai/v11/network/vces/vce
+mso.workflow.default.aai.v11.l3-network.uri=/aai/v11/network/l3-networks/l3-network
+mso.workflow.default.aai.v11.customer.uri=/aai/v11/business/customers/customer
+mso.workflow.default.aai.v11.tenant.uri=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/DFW/tenants/tenant
+mso.workflow.default.aai.v11.generic-query.uri=/aai/v11/search/generic-query
+#note the CloudRegionURI is used for volume-groups
+mso.workflow.default.aai.v11.cloud-region.uri=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner
+mso.workflow.default.aai.v11.nodes-query.uri=/aai/v11/search/nodes-query
+mso.workflow.default.aai.v11.generic-vnf.uri=/aai/v11/network/generic-vnfs/generic-vnf
+mso.workflow.default.aai.v11.cloud-region.uri=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner
+aai.auth=2630606608347B7124C244AB0FE34F6F
diff --git a/kubernetes/so/resources/config/mso/mso.workflow-message-adapter.properties b/kubernetes/so/resources/config/mso/mso.workflow-message-adapter.properties
new file mode 100644
index 0000000000..24b668bb7b
--- /dev/null
+++ b/kubernetes/so/resources/config/mso/mso.workflow-message-adapter.properties
@@ -0,0 +1,7 @@
+# Workflow Adapter properties
+
+# BP notification endpoint that receives workflow messages
+org.openecomp.mso.adapters.workflow.message.bpelurl=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/mso/WorkflowMessage
+
+# Authorization for connecting to workflow.message.bpelurl
+org.openecomp.mso.adapters.workflow.message.bpelauth=5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1
diff --git a/kubernetes/so/resources/config/mso/topology.properties b/kubernetes/so/resources/config/mso/topology.properties
new file mode 100644
index 0000000000..833129e15b
--- /dev/null
+++ b/kubernetes/so/resources/config/mso/topology.properties
@@ -0,0 +1,22 @@
+# This is the topology used by the global healthcheck
+apih-load-balancer=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/
+jra-load-balancer=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/
+camunda-load-balancer=http://{{.Values.service.name}}:{{.Values.service.internalPort}}/
+
+# will be used as entry in DB to say SITE OFF/ON for healthcheck
+site-name=mso-docker
+
+server-port={{.Values.service.internalPort}}
+ssl-enable=false
+
+apih-healthcheck-urn=/ecomp/mso/infra/healthcheck,/asdc/healthcheck,/dbadapters/healthcheck
+jra-healthcheck-urn=/networks/rest/healthcheck,/adapters/rest/healthcheck,/vnfs/rest/healthcheck,/tenants/rest/healthcheck
+camunda-healthcheck-urn=/mso/healthcheck
+
+apih-nodehealthcheck-urn=/ecomp/mso/infra/nodehealthcheck
+jra-nodehealthcheck-urn=/adapters/rest/nodehealthcheck
+camunda-nodehealthcheck-urn=/mso/nodehealthcheck
+msb-ip={{.Values.config.msb.serviceName}}
+msb-port={{.Values.config.msb.port}}
+sdnc-ip={{.Values.config.sdnc.serviceName}}
+sdnc-port={{.Values.config.sdnc.port}}