diff options
12 files changed, 357 insertions, 568 deletions
diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml index 049ac5d457..8be421cbf9 100644 --- a/kubernetes/appc/templates/appc-deployment.yaml +++ b/kubernetes/appc/templates/appc-deployment.yaml @@ -55,10 +55,14 @@ spec: imagePullPolicy: {{ .Values.pullPolicy }} name: appc-controller-container volumeMounts: - - mountPath: /opt/openecomp/appc/data/properties - name: appc-conf - - mountPath: /opt/openecomp/sdnc/data/properties - name: sdnc-conf + - mountPath: /opt/openecomp/appc/data/properties/appc.properties + name: appc-properties + - mountPath: /opt/openecomp/appc/data/properties/aaiclient.properties + name: appc-aaiclient-properties + - mountPath: /opt/openecomp/sdnc/data/properties/aaiclient.properties + name: sdnc-aaiclient-properties + - mountPath: /opt/openecomp/sdnc/data/properties/admportal.json + name: sdnc-admportal-json ports: - containerPort: 8181 - containerPort: 1830 @@ -68,11 +72,17 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 volumes: - - name: appc-conf + - name: appc-properties hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf - - name: sdnc-conf + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf/appc.properties + - name: appc-aaiclient-properties hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf/aaiclient.properties + - name: sdnc-aaiclient-properties + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties + - name: sdnc-admportal-json + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index fd73fc1618..74b189f371 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -2,6 +2,6 @@ nsPrefix: onap pullPolicy: Always image: readiness: oomk8s/readiness-check:1.0.0 - appc: nexus3.onap.org:10001/openecomp/appc-image:1.0-STAGING-latest + appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest mysqlServer: mysql/mysql-server:5.6 - dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.0-STAGING-latest + dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest diff --git a/kubernetes/config/docker/init/src/config/appc/conf/aaiclient.properties b/kubernetes/config/docker/init/src/config/appc/conf/aaiclient.properties new file mode 100644 index 0000000000..a24dfd6a51 --- /dev/null +++ b/kubernetes/config/docker/init/src/config/appc/conf/aaiclient.properties @@ -0,0 +1,254 @@ +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + +# +# Configuration file for A&AI Client +# + +# +# Certificate keystore and truststore +# +org.openecomp.sdnc.sli.aai.ssl.trust=/opt/openecomp/appc/data/stores/truststore.openecomp.client.jks +org.openecomp.sdnc.sli.aai.ssl.trust.psswd=adminadmin +org.openecomp.sdnc.sli.aai.host.certificate.ignore=true + +org.openecomp.sdnc.sli.aai.client.name=APPC +org.openecomp.sdnc.sli.aai.client.psswd=APPC + +org.openecomp.sdnc.sli.aai.application=openECOMP +#connection.timeout=1000 +#read.timeout=2000 + +## TODO - Check if the values below are needed ## +#When the p12 key expires, the new one will probably work with the old jks so no need to generate a new jks. +#org.openecomp.sdnc.sli.aai.ssl.key=/opt/openecomp/appc/data/stores/keystore.client.p12 +#org.openecomp.sdnc.sli.aai.ssl.key.psswd=aaiDomain2 + + +# +# Configuration file for A&AI Client +# +org.openecomp.sdnc.sli.aai.uri=https://aai-service.onap-aai:8443 + + +# query +org.openecomp.sdnc.sli.aai.path.query=/aai/v8/search/sdn-zone-query +org.openecomp.sdnc.sli.aai.query.nodes=/aai/v8/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} +org.openecomp.sdnc.sli.aai.query.generic=/aai/v8/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3 + +# named query +org.openecomp.sdnc.sli.aai.query.named=/aai/search/named-query + +#update +org.openecomp.sdnc.sli.aai.update=/aai/v8/actions/update + +# vce +org.openecomp.sdnc.sli.aai.path.vce =/aai/v8/network/vces/vce/ +org.openecomp.sdnc.sli.aai.path.vces=/aai/v8/network/vces/ + +# vpe +org.openecomp.sdnc.sli.aai.path.vpe =/aai/v8/network/vpes/vpe/ +org.openecomp.sdnc.sli.aai.path.vpes=/aai/v8/network/vpes/ + +# customer +org.openecomp.sdnc.sli.aai.path.customer=/aai/v8/business/customers/customer/{customer-id} + +# service subscription +org.openecomp.sdnc.sli.aai.path.service.subscription=/aai/v8/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type} + +# service instance +org.openecomp.sdnc.sli.aai.path.svcinst=/aai/v8/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances +org.openecomp.sdnc.sli.aai.path.svcinst.query=/aai/v8/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance +org.openecomp.sdnc.sli.aai.path.service.instance=/aai/v8/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id} + +# complex +org.openecomp.sdnc.sli.aai.path.complexes=/aai/v8/cloud-infrastructure/complexes +org.openecomp.sdnc.sli.aai.path.complex=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id} + +# tenant +org.openecomp.sdnc.sli.aai.path.tenant=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id} +org.openecomp.sdnc.sli.aai.path.tenant.query=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant?tenant-name={tenant-name} + +# vservers +org.openecomp.sdnc.sli.aai.path.vservers=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/ +org.openecomp.sdnc.sli.aai.path.vserver=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id} + +# vpls-pe +org.openecomp.sdnc.sli.aai.path.vpls.pes=/aai/v8/network/vpls-pes/ +org.openecomp.sdnc.sli.aai.path.vpls.pe =/aai/v8/network/vpls-pes/vpls-pe/ + +# ctag-pool +org.openecomp.sdnc.sli.aai.path.ctag.pools=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools +org.openecomp.sdnc.sli.aai.path.ctag.pool=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name} + +# +#-------------- 1510 ---------------------- +# + +# pservers +org.openecomp.sdnc.sli.aai.path.pservers=/aai/v8/cloud-infrastructure/pservers +org.openecomp.sdnc.sli.aai.path.pserver=/aai/v8/cloud-infrastructure/pservers/pserver/{hostname} + +# generic-vnf +org.openecomp.sdnc.sli.aai.path.generic.vnfs=/aai/v8/network/generic-vnfs +org.openecomp.sdnc.sli.aai.path.generic.vnf=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id} + +# dvs-switch +org.openecomp.sdnc.sli.aai.path.dvsswitches=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches +org.openecomp.sdnc.sli.aai.path.dvsswitch=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name} + +# L3 Networks +org.openecomp.sdnc.sli.aai.path.l3networks=/aai/v8/network/l3-networks +org.openecomp.sdnc.sli.aai.path.l3network=/aai/v8/network/l3-networks/l3-network/{network-id} +org.openecomp.sdnc.sli.aai.path.l3network.query.name=/aai/v8/network/l3-networks/l3-network?network-name={network-name} + +# P-Interfaces +org.openecomp.sdnc.sli.aai.path.pserver.pinterfaces=/aai/v8/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces +org.openecomp.sdnc.sli.aai.path.pserver.pinterface=/aai/v8/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} + +# Physical Link +org.openecomp.sdnc.sli.aai.path.physical.links=/aai/v8/network/physical-links +org.openecomp.sdnc.sli.aai.path.physical.link=/aai/v8/network/physical-links/physical-link/{link-name} + +# VPN Bindings +org.openecomp.sdnc.sli.aai.path.vpn.bindings=/aai/v8/network/vpn-bindings/ +org.openecomp.sdnc.sli.aai.path.vpn.binding=/aai/v8/network/vpn-bindings/vpn-binding/{vpn-id} + +# VNF IMAGES +org.openecomp.sdnc.sli.aai.path.vnf.images=/aai/v8/service-design-and-creation/vnf-images +org.openecomp.sdnc.sli.aai.path.vnf.image=/aai/v8/service-design-and-creation/vnf-images/vnf-image/{att-uuid} +org.openecomp.sdnc.sli.aai.path.vnf.image.query=/aai/v8/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} + +# UBB Notify +org.openecomp.sdnc.sli.aai.path.notify=/aai/v8/actions/notify +org.openecomp.sdnc.sli.aai.notify.selflink.fqdn=https://aai-service.onap-aai:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} +org.openecomp.sdnc.sli.aai.notify.selflink.avpn=https://aai-service.onap-aai:8543/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information + +# Service +org.openecomp.sdnc.sli.aai.path.service=/aai/v8/service-design-and-creation/services/service/{service-id} +org.openecomp.sdnc.sli.aai.path.services=/aai/v8/service-design-and-creation/services + + +# +#-------------- 1604 ---------------------- +# + +# VNFC +org.openecomp.sdnc.sli.aai.path.vnfc=/aai/v8/network/vnfcs/vnfc/{vnfc-name} + +# class-of-service +org.openecomp.sdnc.sli.aai.path.class.of.service=/aai/v8/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/classes-of-service/class-of-service/{cos-id} + +# site-pair +org.openecomp.sdnc.sli.aai.path.site.pair=/aai/v8/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id} + +# routing-instance +org.openecomp.sdnc.sli.aai.path.routing.instance=/aai/v8/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id} + +# site-pair-set +org.openecomp.sdnc.sli.aai.path.site.pair.set=/aai/v8/network/site-pair-sets/site-pair-set/{site-pair-set-id} + +# license key resource +org.openecomp.sdnc.sli.aai.path.license.acquire=/aai/v8/actions/assignment/license-management/assignment-group-uuid/{assignment-group-uuid} +org.openecomp.sdnc.sli.aai.path.license=/aai/v8/license-management/license-key-resources/license-key-resource/{att-uuid} + +# logical-link +org.openecomp.sdnc.sli.aai.path.logical.link =/aai/v8/network/logical-links/logical-link/{link-name} + +# virtual-data-center +org.openecomp.sdnc.sli.aai.path.virtual.data.center=/aai/v8/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id} + +# wan-connector +org.openecomp.sdnc.sli.aai.path.wan.connector=/aai/v8/business/connectors/connector/{resource-instance-id} + +# l-interface +org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface=/aai/v8/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.openecomp.sdnc.sli.aai.path.p.interface.l.interface=/aai/v8/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} + +# l-interface pnf +org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface.pnf=/aai/v8/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.openecomp.sdnc.sli.aai.path.p.interface.l.interface.pnf=/aai/v8/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} + +# subinterface +org.openecomp.sdnc.sli.aai.path.pnf.lag.interface.subinterface=/aai/v8/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.openecomp.sdnc.sli.aai.path.pnf.p.interface.l.interface=/aai/v8/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} + +# vlans +org.openecomp.sdnc.sli.aai.path.vlan=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface} +org.openecomp.sdnc.sli.aai.path.generic.vnf.vlan=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface} + +# l3-interface-ipv4-address-list +org.openecomp.sdnc.sli.aai.path.l3.interface.ipv4.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} +org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv4.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} + +# l3-interface-ipv6-address-list +org.openecomp.sdnc.sli.aai.path.l3.interface.ipv6.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} +org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv6.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} + +# ipsec-configuration +org.openecomp.sdnc.sli.aai.path.ipsec.configuration=/aai/v8/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id} + +# vig server +org.openecomp.sdnc.sli.aai.path.vig.server=/aai/v8/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers/vig-server/{vig-address-type} + +# l3-network +org.openecomp.sdnc.sli.aai.path.l3.network=/aai/v8/network/l3-networks/l3-network/{network-id} + +# subnet +org.openecomp.sdnc.sli.aai.path.subnet=/aai/v8/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id} + +# multicast-configuration +org.openecomp.sdnc.sli.aai.path.multicast.configuration=/aai/v8/network/multicast-configurations/multicast-configuration/{multicast-configuration-id} + +# org.openecomp.sdnc.sli.aai.path.l.interface.ipv4.address.list +org.openecomp.sdnc.sli.aai.path.l3-interface.ipv4.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} + +# org.openecomp.sdnc.sli.aai.path.l.interface.vlan.ipv4.address.list +org.openecomp.sdnc.sli.aai.path.l3-interface.vlan.ipv4.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} + +# org.openecomp.sdnc.sli.aai.path.l.interface.ipv6.address.list +org.openecomp.sdnc.sli.aai.path.l3-interface.ipv6.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} + +# volume.group +org.openecomp.sdnc.sli.aai.path.volume.group=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups/volume-group/{volume-group-id} + +#cloud region +org.openecomp.sdnc.sli.aai.path.cloud.region=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id} + +# vf-module +org.openecomp.sdnc.sli.aai.path.vf.module=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id} + +# l-interface through generic-vnf +org.openecomp.sdnc.sli.aai.path.generic.vnf.linterface=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name} + +# network-policy +org.openecomp.sdnc.sli.aai.path.network.policy=/aai/v8/network/network-policies/network-policy/{network-policy-id} + +# pnf +org.openecomp.sdnc.sli.aai.path.pnf=/aai/v8/network/pnfs/pnf/{pnf-name} + +# +# Formatting +# +org.openecomp.sdnc.sli.aai.param.format=filter=%s:%s +org.openecomp.sdnc.sli.aai.param.vnf_type=vnf-type +org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id +org.openecomp.sdnc.sli.aai.param.service.type=service-type + diff --git a/kubernetes/config/docker/init/src/config/appc/conf/appc.properties b/kubernetes/config/docker/init/src/config/appc/conf/appc.properties index edd8268c93..8f7a569f1d 100755..100644 --- a/kubernetes/config/docker/init/src/config/appc/conf/appc.properties +++ b/kubernetes/config/docker/init/src/config/appc/conf/appc.properties @@ -1,40 +1,38 @@ ### # ============LICENSE_START======================================================= -# openECOMP : APP-C +# APPC # ================================================================================ -# Copyright (C) 2017 OpenECOMP +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= +# ECOMP is a trademark and service mark of AT&T Intellectual Property. ### -### ### -### Closed-Loop 1607 Properties (for demo) ### -### ### -appc.ClosedLoop1607.poolMembers=dmaap.onap-message-router:3904 -appc.ClosedLoop1607.topic.read=APPC-CL -appc.ClosedLoop1607.topic.write=APPC-CL -appc.ClosedLoop1607.client.name=APPC-TEST-CLIENT-DEMO-EXAMPLE -appc.ClosedLoop1607.client.name.id=0 -#dmaap.client.key=J6JsbtSm4By5CWAr -#dmaap.client.secret=kmadWKmItZTnajR9rBmcRCXG -appc.ClosedLoop1607.threads.queuesize.min=1 -appc.ClosedLoop1607.threads.queuesize.max=1000 -appc.ClosedLoop1607.threads.poolsize.min=1 -appc.ClosedLoop1607.threads.poolsize.max=2 -appc.ClosedLoop1607.provider.user=admin -appc.ClosedLoop1607.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -appc.ClosedLoop1607.provider.url=http://localhost:8181/restconf/operations/appc-provider +### ### +### Properties for demo ### +### ### +appc.demo.poolMembers=dmaap.onap-message-router:3904 +appc.demo.topic.read=APPC-DEMO-TOPIC +appc.demo.topic.write=APPC-DEMO-TOPIC +appc.demo.client.name=appcDemoEventListener +appc.demo.threads.queuesize.min=1 +appc.demo.threads.queuesize.max=1000 +appc.demo.threads.poolsize.min=1 +appc.demo.threads.poolsize.max=2 +appc.demo.provider.user=admin +appc.demo.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +appc.demo.provider.url=http://localhost:8181/restconf/operations/appc-provider appc.provider.vfodl.url=http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@sdnhost.onap-appc:8282/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/ # The properties right below are needed to properly call the Master DG to serve demo purposes @@ -46,9 +44,9 @@ appc.topology.dg.version=2.0.0 -### ### +### ### ### OpenStack credentials (these properties also are used in appc-rest-adapter-bundle, appc-chef-adapter-bundle, appc-iaas-adapter-bundle) ### -### ### +### ### provider1.type=test provider1.name=test provider1.identity=http://identity1.appc.local/test @@ -60,27 +58,18 @@ provider1.tenant1.password=test -### ### -### Properties that are not covered or being replaced from default.properties files. Default value for DMaaP IP is dmaap.onap-message-router:3904 ### +### ### +### Properties that are not covered or being replaced from default.properties files. Default value for DMaaP IP is 10.0.11.1:3904 ### ### which is what the Master HEAT Template to instantiate OpenECOMP is pointing to (version R1). All other default values are ### ### left there since these are pre-defined as part of APP-C/OpenECOMP default instantiation with Master HEAT Template ### -### ### +### ### -# Property below is valid in appc-command-executor-core, appc-license-manager-core, appc-lifecycle-management-core, +# Property below is valid in appc-command-executor-core, appc-license-manager-core, appc-lifecycle-management-core, # appc-request-handler-core, appc-workflow-management-core (all from the appc-dispatcher package). dmaap.poolMembers=dmaap.onap-message-router:3904 -# appc-event-listener-bundle properties (DMaaP topics need to be defined in default.properties files in src/main and src/test). -appc.ClosedLoop.poolMembers=dmaap.onap-message-router:3904 -appc.ClosedLoop.client.key=testCL -appc.ClosedLoop.client.secret=testCL -appc.ClosedLoop.provider.url=https://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@localhost:8443/restconf/operations/appc-provider:topology-operation -appc.ClosedLoop.provider.url.user=admin -appc.ClosedLoop.provider.url.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -test.vm_url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999999 - # appc-event-listener-bundle properties (only defined in src/test of default.properties) appc.LCM.poolMembers=dmaap.onap-message-router:3904 appc.LCM.topic.read=testLCM @@ -99,7 +88,7 @@ restconf.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U # properties found in appc-rest-adapter-bundle, appc-chef-adapter-bundle, appc-iaas-adapter-bundle) #Your OpenStack IP -test.ip=dmaap.onap-message-router00 +test.ip=10.0.11.100 # Your OpenStack Platform's Keystone Port (default is 5000) test.port=5000 test.tenantid=test @@ -108,8 +97,8 @@ test.vmid=test test.url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999999 -# Properties from default.properties in the src/test and src/main paths of appc-asdc-listener-bundle -appc.asdc.host=sdc-be.onap-sdc +# Properties from default.properties in the src/test and src/main paths of appc-asdc-listener-bundle +appc.asdc.host=sdc-be.onap-sdc:8443 appc.asdc.env=APPC-ASDC-ENV appc.asdc.user=test appc.asdc.pass=test @@ -117,30 +106,19 @@ appc.asdc.consumer=APPC-ASDC-CONSUMER appc.asdc.consumer.id=APPC-ASDC-CONSUMER-ID appc.asdc.provider.url=http://localhost:8181/restconf/operations/AsdcMessage:configuration-document-request - - - - - - - - - - - - - - - - - - - - - -appc.asdc.env=AUTO - - -appc.asdc.env=SUCCESS - - +# Properties used by EventSenderDmaapImpl.java +DCAE.dmaap.event.topic.write=EventSenderTest +DCAE.dmaap.appc.username=test +DCAE.dmaap.appc.password=test +DCAE.dmaap.event.pool.members=dmaap.onap-message-router:3904 + +#OAM Listener +appc.OAM.disabled=true +appc.OAM.provider.url=http://localhost:8181/restconf/operations/appc-oam +appc.OAM.poolMembers=dmaap.onap-message-router:3904 +appc.OAM.service=ueb +appc.OAM.topic.read=testOAM +appc.OAM.topic.write=testOAM +appc.OAM.client.name=testOAM +appc.OAM.provider.user=admin +appc.OAM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U diff --git a/kubernetes/config/docker/init/src/config/sdnc/conf/aaiclient.properties b/kubernetes/config/docker/init/src/config/sdnc/conf/aaiclient.properties index cacba366fe..fbd74d5499 100755 --- a/kubernetes/config/docker/init/src/config/sdnc/conf/aaiclient.properties +++ b/kubernetes/config/docker/init/src/config/sdnc/conf/aaiclient.properties @@ -2,15 +2,15 @@ # ============LICENSE_START======================================================= # openECOMP : SDN-C # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights +# Copyright (C) 2017 ONAP Intellectual Property. All rights # reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,215 +30,56 @@ org.openecomp.sdnc.sli.aai.ssl.trust=/opt/openecomp/sdnc/data/stores/truststore. org.openecomp.sdnc.sli.aai.ssl.trust.psswd=adminadmin org.openecomp.sdnc.sli.aai.host.certificate.ignore=true -org.openecomp.sdnc.sli.aai.client.name=SDNC -org.openecomp.sdnc.sli.aai.client.psswd=SDNC +org.openecomp.sdnc.sli.aai.client.name=ONAP +org.openecomp.sdnc.sli.aai.client.psswd=ONAP -org.openecomp.sdnc.sli.aai.application=openECOMP -#connection.timeout=1000 -#read.timeout=2000 +org.openecomp.sdnc.sli.aai.application=ONAP # # Configuration file for A&AI Client # org.openecomp.sdnc.sli.aai.uri=https://aai-service.onap-aai:8443 - +connection.timeout=60000 +read.timeout=60000 # query -org.openecomp.sdnc.sli.aai.path.query=/aai/v8/search/sdn-zone-query -org.openecomp.sdnc.sli.aai.query.nodes=/aai/v8/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} -org.openecomp.sdnc.sli.aai.query.generic=/aai/v8/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3 +org.openecomp.sdnc.sli.aai.path.query=/aai/v11/search/sdn-zone-query +org.openecomp.sdnc.sli.aai.query.nodes=/aai/v11/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} +org.openecomp.sdnc.sli.aai.query.generic=/aai/v11/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3 # named query org.openecomp.sdnc.sli.aai.query.named=/aai/search/named-query - #update -org.openecomp.sdnc.sli.aai.update=/aai/v8/actions/update - -# vce -org.openecomp.sdnc.sli.aai.path.vce =/aai/v8/network/vces/vce/ -org.openecomp.sdnc.sli.aai.path.vces=/aai/v8/network/vces/ - -# vpe -org.openecomp.sdnc.sli.aai.path.vpe =/aai/v8/network/vpes/vpe/ -org.openecomp.sdnc.sli.aai.path.vpes=/aai/v8/network/vpes/ - -# customer -org.openecomp.sdnc.sli.aai.path.customer=/aai/v8/business/customers/customer/{customer-id} - -# service subscription -org.openecomp.sdnc.sli.aai.path.service.subscription=/aai/v8/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type} - -# service instance -org.openecomp.sdnc.sli.aai.path.svcinst=/aai/v8/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances -org.openecomp.sdnc.sli.aai.path.svcinst.query=/aai/v8/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance -org.openecomp.sdnc.sli.aai.path.service.instance=/aai/v8/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id} - -# complex -org.openecomp.sdnc.sli.aai.path.complexes=/aai/v8/cloud-infrastructure/complexes -org.openecomp.sdnc.sli.aai.path.complex=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id} - -# tenant -org.openecomp.sdnc.sli.aai.path.tenant=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id} -org.openecomp.sdnc.sli.aai.path.tenant.query=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant?tenant-name={tenant-name} - -# vservers -org.openecomp.sdnc.sli.aai.path.vservers=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/ -org.openecomp.sdnc.sli.aai.path.vserver=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id} - -# vpls-pe -org.openecomp.sdnc.sli.aai.path.vpls.pes=/aai/v8/network/vpls-pes/ -org.openecomp.sdnc.sli.aai.path.vpls.pe =/aai/v8/network/vpls-pes/vpls-pe/ +org.openecomp.sdnc.sli.aai.update=/aai/v11/actions/update -# ctag-pool -org.openecomp.sdnc.sli.aai.path.ctag.pools=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools -org.openecomp.sdnc.sli.aai.path.ctag.pool=/aai/v8/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name} - -# -#-------------- 1510 ---------------------- -# - -# pservers -org.openecomp.sdnc.sli.aai.path.pservers=/aai/v8/cloud-infrastructure/pservers -org.openecomp.sdnc.sli.aai.path.pserver=/aai/v8/cloud-infrastructure/pservers/pserver/{hostname} - -# generic-vnf -org.openecomp.sdnc.sli.aai.path.generic.vnfs=/aai/v8/network/generic-vnfs -org.openecomp.sdnc.sli.aai.path.generic.vnf=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id} - -# dvs-switch -org.openecomp.sdnc.sli.aai.path.dvsswitches=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches -org.openecomp.sdnc.sli.aai.path.dvsswitch=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name} - -# L3 Networks -org.openecomp.sdnc.sli.aai.path.l3networks=/aai/v8/network/l3-networks -org.openecomp.sdnc.sli.aai.path.l3network=/aai/v8/network/l3-networks/l3-network/{network-id} -org.openecomp.sdnc.sli.aai.path.l3network.query.name=/aai/v8/network/l3-networks/l3-network?network-name={network-name} +# UBB Notify +org.openecomp.sdnc.sli.aai.path.notify=/aai/v11/actions/notify +org.openecomp.sdnc.sli.aai.notify.selflink.fqdn=<%= @ubbUri %>/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} +org.openecomp.sdnc.sli.aai.notify.selflink.avpn=<%= @ubbUri %>/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information # P-Interfaces -org.openecomp.sdnc.sli.aai.path.pserver.pinterfaces=/aai/v8/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces -org.openecomp.sdnc.sli.aai.path.pserver.pinterface=/aai/v8/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} - -# Physical Link -org.openecomp.sdnc.sli.aai.path.physical.links=/aai/v8/network/physical-links -org.openecomp.sdnc.sli.aai.path.physical.link=/aai/v8/network/physical-links/physical-link/{link-name} - -# VPN Bindings -org.openecomp.sdnc.sli.aai.path.vpn.bindings=/aai/v8/network/vpn-bindings/ -org.openecomp.sdnc.sli.aai.path.vpn.binding=/aai/v8/network/vpn-bindings/vpn-binding/{vpn-id} - -# VNF IMAGES -org.openecomp.sdnc.sli.aai.path.vnf.images=/aai/v8/service-design-and-creation/vnf-images -org.openecomp.sdnc.sli.aai.path.vnf.image=/aai/v8/service-design-and-creation/vnf-images/vnf-image/{att-uuid} -org.openecomp.sdnc.sli.aai.path.vnf.image.query=/aai/v8/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} - -# UBB Notify -org.openecomp.sdnc.sli.aai.path.notify=/aai/v8/actions/notify -org.openecomp.sdnc.sli.aai.notify.selflink.fqdn=https://aai-service.onap-aai:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} -org.openecomp.sdnc.sli.aai.notify.selflink.avpn=https://aai-service.onap-aai:8543/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information +org.openecomp.sdnc.sli.aai.path.pserver.pinterfaces=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces +org.openecomp.sdnc.sli.aai.path.pserver.pinterface=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} # Service -org.openecomp.sdnc.sli.aai.path.service=/aai/v8/service-design-and-creation/services/service/{service-id} -org.openecomp.sdnc.sli.aai.path.services=/aai/v8/service-design-and-creation/services - +org.openecomp.sdnc.sli.aai.path.service=/aai/v11/service-design-and-creation/services/service/{service-id} +org.openecomp.sdnc.sli.aai.path.services=/aai/v11/service-design-and-creation/services -# -#-------------- 1604 ---------------------- -# - -# VNFC -org.openecomp.sdnc.sli.aai.path.vnfc=/aai/v8/network/vnfcs/vnfc/{vnfc-name} - -# class-of-service -org.openecomp.sdnc.sli.aai.path.class.of.service=/aai/v8/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/classes-of-service/class-of-service/{cos-id} - -# site-pair -org.openecomp.sdnc.sli.aai.path.site.pair=/aai/v8/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id} - -# routing-instance -org.openecomp.sdnc.sli.aai.path.routing.instance=/aai/v8/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id} +# service instance +org.openecomp.sdnc.sli.aai.path.svcinst=/aai/v11/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances +org.openecomp.sdnc.sli.aai.path.svcinst.query=/aai/v11/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance +org.openecomp.sdnc.sli.aai.path.service.instance=/aai/v11/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id} # site-pair-set -org.openecomp.sdnc.sli.aai.path.site.pair.set=/aai/v8/network/site-pair-sets/site-pair-set/{site-pair-set-id} - -# license key resource -org.openecomp.sdnc.sli.aai.path.license.acquire=/aai/v8/actions/assignment/license-management/assignment-group-uuid/{assignment-group-uuid} -org.openecomp.sdnc.sli.aai.path.license=/aai/v8/license-management/license-key-resources/license-key-resource/{att-uuid} - -# logical-link -org.openecomp.sdnc.sli.aai.path.logical.link =/aai/v8/network/logical-links/logical-link/{link-name} - -# virtual-data-center -org.openecomp.sdnc.sli.aai.path.virtual.data.center=/aai/v8/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id} - -# wan-connector -org.openecomp.sdnc.sli.aai.path.wan.connector=/aai/v8/business/connectors/connector/{resource-instance-id} - -# l-interface -org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface=/aai/v8/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} -org.openecomp.sdnc.sli.aai.path.p.interface.l.interface=/aai/v8/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} - -# l-interface pnf -org.openecomp.sdnc.sli.aai.path.lag.interface.l.interface.pnf=/aai/v8/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} -org.openecomp.sdnc.sli.aai.path.p.interface.l.interface.pnf=/aai/v8/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} - -# subinterface -org.openecomp.sdnc.sli.aai.path.pnf.lag.interface.subinterface=/aai/v8/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} -org.openecomp.sdnc.sli.aai.path.pnf.p.interface.l.interface=/aai/v8/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} - -# vlans -org.openecomp.sdnc.sli.aai.path.vlan=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface} -org.openecomp.sdnc.sli.aai.path.generic.vnf.vlan=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface} - -# l3-interface-ipv4-address-list -org.openecomp.sdnc.sli.aai.path.l3.interface.ipv4.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} -org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv4.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} +org.openecomp.sdnc.sli.aai.path.site.pair.set=/aai/v11/network/site-pair-sets/site-pair-set/{site-pair-set-id} -# l3-interface-ipv6-address-list -org.openecomp.sdnc.sli.aai.path.l3.interface.ipv6.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} -org.openecomp.sdnc.sli.aai.path.vlan.l3.interface.ipv6.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} +# VNF IMAGES QUERY +org.openecomp.sdnc.sli.aai.path.vnf.image.query=/aai/v11/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} -# ipsec-configuration -org.openecomp.sdnc.sli.aai.path.ipsec.configuration=/aai/v8/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id} - -# vig server -org.openecomp.sdnc.sli.aai.path.vig.server=/aai/v8/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers/vig-server/{vig-address-type} - -# l3-network -org.openecomp.sdnc.sli.aai.path.l3.network=/aai/v8/network/l3-networks/l3-network/{network-id} - -# subnet -org.openecomp.sdnc.sli.aai.path.subnet=/aai/v8/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id} - -# multicast-configuration -org.openecomp.sdnc.sli.aai.path.multicast.configuration=/aai/v8/network/multicast-configurations/multicast-configuration/{multicast-configuration-id} - -# org.openecomp.sdnc.sli.aai.path.l.interface.ipv4.address.list -org.openecomp.sdnc.sli.aai.path.l3-interface.ipv4.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} - -# org.openecomp.sdnc.sli.aai.path.l.interface.vlan.ipv4.address.list -org.openecomp.sdnc.sli.aai.path.l3-interface.vlan.ipv4.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} - -# org.openecomp.sdnc.sli.aai.path.l.interface.ipv6.address.list -org.openecomp.sdnc.sli.aai.path.l3-interface.ipv6.address.list=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} - -# volume.group -org.openecomp.sdnc.sli.aai.path.volume.group=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups/volume-group/{volume-group-id} - -#cloud region -org.openecomp.sdnc.sli.aai.path.cloud.region=/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id} - -# vf-module -org.openecomp.sdnc.sli.aai.path.vf.module=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id} - -# l-interface through generic-vnf -org.openecomp.sdnc.sli.aai.path.generic.vnf.linterface=/aai/v8/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name} - -# network-policy -org.openecomp.sdnc.sli.aai.path.network.policy=/aai/v8/network/network-policies/network-policy/{network-policy-id} - -# pnf -org.openecomp.sdnc.sli.aai.path.pnf=/aai/v8/network/pnfs/pnf/{pnf-name} +# vservers +org.openecomp.sdnc.sli.aai.path.vservers=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/ +org.openecomp.sdnc.sli.aai.path.vserver=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id} # # Formatting diff --git a/kubernetes/config/docker/init/src/config/sdnc/conf/admportal.log4js.json b/kubernetes/config/docker/init/src/config/sdnc/conf/admportal.log4js.json deleted file mode 100755 index 1dcb699e2d..0000000000 --- a/kubernetes/config/docker/init/src/config/sdnc/conf/admportal.log4js.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "appenders": [ - { - "category": "accesslog", - "type" : "dateFile", - "absolute": true, - "filename": "/opt/admportal/logs/accesslog.rp", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "usertrace", - "type" : "file", - "absolute" : true, - "filename" : "/opt/admportal/logs/usertrace.log" - }, - { - "category": "tracelog", - "type" : "dateFile", - "absolute": true, - "filename": "/opt/admportal/logs/tracelog.log", - "pattern": "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "eipam", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/eipam.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "instar", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/instar.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "app", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/app.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "csp", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/csp.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "db", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/db.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "admin", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/admin.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "resalloc", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/resalloc.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "logs", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/applogs.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "sla", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/sla.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "gamma", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/gamma.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "odl", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/odl.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "mobility", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/mobility.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "ucpe", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/ucpe.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - }, - { - "category" : "user", - "type" : "dateFile", - "absolute" : true, - "filename" : "/opt/admportal/logs/user.log", - "pattern" : "-yyyy-MM-dd", - "alwaysIncludePattern": true, - "backups" : 14 - } - ] -} diff --git a/kubernetes/config/docker/init/src/config/sdnc/conf/dblib.properties b/kubernetes/config/docker/init/src/config/sdnc/conf/dblib.properties deleted file mode 100755 index 0e79befdad..0000000000 --- a/kubernetes/config/docker/init/src/config/sdnc/conf/dblib.properties +++ /dev/null @@ -1,37 +0,0 @@ -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -# dblib.properrties -org.openecomp.sdnc.sli.dbtype=jdbc - -org.openecomp.sdnc.sli.jdbc.hosts=sdnctldb01 -org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl -org.openecomp.sdnc.sli.jdbc.database=sdnctl -org.openecomp.sdnc.sli.jdbc.user=sdnctl -org.openecomp.sdnc.sli.jdbc.password=gamma -org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01 -org.openecomp.sdnc.sli.jdbc.connection.timeout=50 -org.openecomp.sdnc.sli.jdbc.request.timeout=100 -org.openecomp.sdnc.sli.jdbc.limit.init=10 -org.openecomp.sdnc.sli.jdbc.limit.min=10 -org.openecomp.sdnc.sli.jdbc.limit.max=20 -org.openecomp.dblib.connection.recovery=false - diff --git a/kubernetes/config/docker/init/src/config/sdnc/conf/mdsal-resource.properties b/kubernetes/config/docker/init/src/config/sdnc/conf/mdsal-resource.properties deleted file mode 100755 index e4a585ff12..0000000000 --- a/kubernetes/config/docker/init/src/config/sdnc/conf/mdsal-resource.properties +++ /dev/null @@ -1,27 +0,0 @@ -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -org.openecomp.sdnc.sli.resource.mdsal.sdnc-user=admin -org.openecomp.sdnc.sli.resource.mdsal.sdnc-passwd=admin -org.openecomp.sdnc.sli.resource.mdsal.sdnc-host=localhost -org.openecomp.sdnc.sli.resource.mdsal.sdnc-protocol=http -org.openecomp.sdnc.sli.resource.mdsal.sdnc-port=8181 - diff --git a/kubernetes/config/docker/init/src/config/sdnc/conf/sql-resource.properties b/kubernetes/config/docker/init/src/config/sdnc/conf/sql-resource.properties deleted file mode 100755 index ac32f77345..0000000000 --- a/kubernetes/config/docker/init/src/config/sdnc/conf/sql-resource.properties +++ /dev/null @@ -1,23 +0,0 @@ -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -org.openecomp.sdnc.resource.sql.cryptkey=QtfJMKggVk - diff --git a/kubernetes/config/docker/init/src/config/sdnc/conf/svclogic.properties b/kubernetes/config/docker/init/src/config/sdnc/conf/svclogic.properties deleted file mode 100755 index efc1cb341b..0000000000 --- a/kubernetes/config/docker/init/src/config/sdnc/conf/svclogic.properties +++ /dev/null @@ -1,29 +0,0 @@ -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -org.openecomp.sdnc.sli.dbtype = dblib -#Note : the next 4 fields are only used if org.openecomp.sdnc.sli.dbtype = jdbc -org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl -org.openecomp.sdnc.sli.jdbc.database=sdnctl -org.openecomp.sdnc.sli.jdbc.user=sdnctl -org.openecomp.sdnc.sli.jdbc.password=gamma - -org.xml.sax.driver=org.apache.xerces.parsers.SAXParser diff --git a/kubernetes/config/docker/init/src/config/sdnc/conf/svclogic.properties.sdnctldb01 b/kubernetes/config/docker/init/src/config/sdnc/conf/svclogic.properties.sdnctldb01 deleted file mode 100755 index efc1cb341b..0000000000 --- a/kubernetes/config/docker/init/src/config/sdnc/conf/svclogic.properties.sdnctldb01 +++ /dev/null @@ -1,29 +0,0 @@ -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -org.openecomp.sdnc.sli.dbtype = dblib -#Note : the next 4 fields are only used if org.openecomp.sdnc.sli.dbtype = jdbc -org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl -org.openecomp.sdnc.sli.jdbc.database=sdnctl -org.openecomp.sdnc.sli.jdbc.user=sdnctl -org.openecomp.sdnc.sli.jdbc.password=gamma - -org.xml.sax.driver=org.apache.xerces.parsers.SAXParser diff --git a/kubernetes/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml index cb296da498..f4947924ba 100644 --- a/kubernetes/sdnc/templates/sdnc-deployment.yaml +++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml @@ -51,8 +51,10 @@ spec: imagePullPolicy: {{ .Values.pullPolicy }} name: sdnc-controller-container volumeMounts: - - mountPath: /opt/openecomp/sdnc/data/properties - name: sdnc-conf + - mountPath: /opt/openecomp/sdnc/data/properties/aaiclient.properties + name: sdnc-aaiclient-properties + - mountPath: /opt/openecomp/sdnc/data/properties/admportal.json + name: sdnc-admportal-json ports: - containerPort: 8181 readinessProbe: @@ -61,8 +63,11 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 volumes: - - name: sdnc-conf + - name: sdnc-aaiclient-properties hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties + - name: sdnc-admportal-json + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" |