diff options
26 files changed, 383 insertions, 184 deletions
diff --git a/kubernetes/aaf/templates/aaf-cs-deployment.yaml b/kubernetes/aaf/templates/aaf-cs-deployment.yaml index f240150f96..23968f9313 100644 --- a/kubernetes/aaf/templates/aaf-cs-deployment.yaml +++ b/kubernetes/aaf/templates/aaf-cs-deployment.yaml @@ -22,14 +22,14 @@ spec: name: "aaf-cs" volumeMounts: - mountPath: /data - name: aaf-data + name: aaf-cs-data readinessProbe: tcpSocket: port: 7000 initialDelaySeconds: 5 periodSeconds: 10 volumes: - - name: aaf-data + - name: aaf-cs-data hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data imagePullSecrets: diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml index 20e21c4ee8..5950b92c00 100644 --- a/kubernetes/aaf/templates/aaf-deployment.yaml +++ b/kubernetes/aaf/templates/aaf-deployment.yaml @@ -47,11 +47,18 @@ spec: value: cassandra_container image: {{ .Values.image.aafImage }}:{{ .Values.image.aafVersion }} imagePullPolicy: {{ .Values.pullPolicy }} + volumeMounts: + - mountPath: /data + name: aaf-data name: aaf readinessProbe: tcpSocket: port: 8101 initialDelaySeconds: 5 periodSeconds: 10 + volumes: + - name: aaf-data + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aaf/data2 imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key diff --git a/kubernetes/config/docker/init/src/config/aaf/data2/identities.dat b/kubernetes/config/docker/init/src/config/aaf/data2/identities.dat new file mode 100644 index 0000000000..95eb51d1be --- /dev/null +++ b/kubernetes/config/docker/init/src/config/aaf/data2/identities.dat @@ -0,0 +1,9 @@ +iowna|Ima D. Owner|Ima|Owner|314-123-2000|ima.d.owner@osaaf.com|e| +mmanager|Mark D. Manager|Mark|Manager|314-123-1234|mark.d.manager@osaaf.com|e|iowna +bdevl|Robert D. Developer|Bob|Developer|314-123-1235|bob.d.develper@osaaf.com|e|mmanager +mmarket|Mary D. Marketer|Mary|Marketer|314-123-1236|mary.d.marketer@osaaf.com|e|mmanager +ccontra|Clarice D. Contractor|Clarice|Contractor|314-123-1237|clarice.d.contractor@osaaf.com|c|mmanager +iretired|Ira Lee M. Retired|Ira|Retired|314-123-1238|clarice.d.contractor@osaaf.com|n|mmanager +osaaf|ID of AAF|||||a|bdevl +m99751|ID of AAF|||||a|bdevl +m99501|ID of AAF|||||a|bdevl 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 fbd74d5499..4f66294c42 100755 --- a/kubernetes/config/docker/init/src/config/sdnc/conf/aaiclient.properties +++ b/kubernetes/config/docker/init/src/config/sdnc/conf/aaiclient.properties @@ -26,65 +26,224 @@ # # Certificate keystore and truststore # -org.openecomp.sdnc.sli.aai.ssl.trust=/opt/openecomp/sdnc/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.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks +org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin +org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true -org.openecomp.sdnc.sli.aai.client.name=ONAP -org.openecomp.sdnc.sli.aai.client.psswd=ONAP +org.onap.ccsdk.sli.adaptors.aai.client.name=AAI +org.onap.ccsdk.sli.adaptors.aai.client.psswd=AAI -org.openecomp.sdnc.sli.aai.application=ONAP +org.onap.ccsdk.sli.adaptors.aai.application=openECOMP +#connection.timeout=1000 +#read.timeout=2000 # # Configuration file for A&AI Client # -org.openecomp.sdnc.sli.aai.uri=https://aai-service.onap-aai:8443 -connection.timeout=60000 -read.timeout=60000 +org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-service.onap-aai:8443 + # query -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 +org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v11/search/sdn-zone-query +org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v11/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} +org.onap.ccsdk.sli.adaptors.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 +org.onap.ccsdk.sli.adaptors.aai.query.named=/aai/search/named-query + #update -org.openecomp.sdnc.sli.aai.update=/aai/v11/actions/update +org.onap.ccsdk.sli.adaptors.aai.update=/aai/v11/actions/update -# 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 +# vce +org.onap.ccsdk.sli.adaptors.aai.path.vce =/aai/v11/network/vces/vce/ +org.onap.ccsdk.sli.adaptors.aai.path.vces=/aai/v11/network/vces/ + +# vpe +org.onap.ccsdk.sli.adaptors.aai.path.vpe =/aai/v11/network/vpes/vpe/ +org.onap.ccsdk.sli.adaptors.aai.path.vpes=/aai/v11/network/vpes/ + +# customer +org.onap.ccsdk.sli.adaptors.aai.path.customer=/aai/v11/business/customers/customer/{customer-id} + +# service subscription +org.onap.ccsdk.sli.adaptors.aai.path.service.subscription=/aai/v11/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type} + +# service instance +org.onap.ccsdk.sli.adaptors.aai.path.svcinst=/aai/v11/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances +org.onap.ccsdk.sli.adaptors.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.onap.ccsdk.sli.adaptors.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} + +# complex +org.onap.ccsdk.sli.adaptors.aai.path.complexes=/aai/v11/cloud-infrastructure/complexes +org.onap.ccsdk.sli.adaptors.aai.path.complex=/aai/v11/cloud-infrastructure/complexes/complex/{physical-location-id} + +# tenant +org.onap.ccsdk.sli.adaptors.aai.path.tenant=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id} +org.onap.ccsdk.sli.adaptors.aai.path.tenant.query=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant?tenant-name={tenant-name} + +# vservers +org.onap.ccsdk.sli.adaptors.aai.path.vservers=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/ +org.onap.ccsdk.sli.adaptors.aai.path.vserver=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id} + +# vpls-pe +org.onap.ccsdk.sli.adaptors.aai.path.vpls.pes=/aai/v11/network/vpls-pes/ +org.onap.ccsdk.sli.adaptors.aai.path.vpls.pe =/aai/v11/network/vpls-pes/vpls-pe/ + +# ctag-pool +org.onap.ccsdk.sli.adaptors.aai.path.ctag.pools=/aai/v11/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools +org.onap.ccsdk.sli.adaptors.aai.path.ctag.pool=/aai/v11/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name} + +# +#-------------- 1510 ---------------------- +# + +# pservers +org.onap.ccsdk.sli.adaptors.aai.path.pservers=/aai/v11/cloud-infrastructure/pservers +org.onap.ccsdk.sli.adaptors.aai.path.pserver=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname} + +# generic-vnf +org.onap.ccsdk.sli.adaptors.aai.path.generic.vnfs=/aai/v11/network/generic-vnfs +org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id} + +# dvs-switch +org.onap.ccsdk.sli.adaptors.aai.path.dvsswitches=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches +org.onap.ccsdk.sli.adaptors.aai.path.dvsswitch=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name} + +# L3 Networks +org.onap.ccsdk.sli.adaptors.aai.path.l3networks=/aai/v11/network/l3-networks +org.onap.ccsdk.sli.adaptors.aai.path.l3network=/aai/v11/network/l3-networks/l3-network/{network-id} +org.onap.ccsdk.sli.adaptors.aai.path.l3network.query.name=/aai/v11/network/l3-networks/l3-network?network-name={network-name} # P-Interfaces -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} +org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces +org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} + +# Physical Link +org.onap.ccsdk.sli.adaptors.aai.path.physical.links=/aai/v11/network/physical-links +org.onap.ccsdk.sli.adaptors.aai.path.physical.link=/aai/v11/network/physical-links/physical-link/{link-name} + +# VPN Bindings +org.onap.ccsdk.sli.adaptors.aai.path.vpn.bindings=/aai/v11/network/vpn-bindings/ +org.onap.ccsdk.sli.adaptors.aai.path.vpn.binding=/aai/v11/network/vpn-bindings/vpn-binding/{vpn-id} + +# VNF IMAGES +org.onap.ccsdk.sli.adaptors.aai.path.vnf.images=/aai/v11/service-design-and-creation/vnf-images +org.onap.ccsdk.sli.adaptors.aai.path.vnf.image=/aai/v11/service-design-and-creation/vnf-images/vnf-image/{att-uuid} +org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v11/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} + +# UBB Notify +org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v11/actions/notify +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=https://aai-service.onap-aai:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} +org.onap.ccsdk.sli.adaptors.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/v11/service-design-and-creation/services/service/{service-id} -org.openecomp.sdnc.sli.aai.path.services=/aai/v11/service-design-and-creation/services +org.onap.ccsdk.sli.adaptors.aai.path.service=/aai/v11/service-design-and-creation/services/service/{service-id} +org.onap.ccsdk.sli.adaptors.aai.path.services=/aai/v11/service-design-and-creation/services -# 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} + +# +#-------------- 1604 ---------------------- +# + +# VNFC +org.onap.ccsdk.sli.adaptors.aai.path.vnfc=/aai/v11/network/vnfcs/vnfc/{vnfc-name} + +# class-of-service +org.onap.ccsdk.sli.adaptors.aai.path.class.of.service=/aai/v11/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.onap.ccsdk.sli.adaptors.aai.path.site.pair=/aai/v11/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.onap.ccsdk.sli.adaptors.aai.path.routing.instance=/aai/v11/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/v11/network/site-pair-sets/site-pair-set/{site-pair-set-id} +org.onap.ccsdk.sli.adaptors.aai.path.site.pair.set=/aai/v11/network/site-pair-sets/site-pair-set/{site-pair-set-id} -# 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} +# license key resource +org.onap.ccsdk.sli.adaptors.aai.path.license.acquire=/aai/v11/actions/assignment/license-management/assignment-group-uuid/{assignment-group-uuid} +org.onap.ccsdk.sli.adaptors.aai.path.license=/aai/v11/license-management/license-key-resources/license-key-resource/{att-uuid} -# 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} +# logical-link +org.onap.ccsdk.sli.adaptors.aai.path.logical.link =/aai/v11/network/logical-links/logical-link/{link-name} + +# virtual-data-center +org.onap.ccsdk.sli.adaptors.aai.path.virtual.data.center=/aai/v11/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id} + +# wan-connector +org.onap.ccsdk.sli.adaptors.aai.path.wan.connector=/aai/v11/business/connectors/connector/{resource-instance-id} + +# l-interface +org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} + +# l-interface pnf +org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface.pnf=/aai/v11/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface.pnf=/aai/v11/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} + +# subinterface +org.onap.ccsdk.sli.adaptors.aai.path.pnf.lag.interface.subinterface=/aai/v11/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.pnf.p.interface.l.interface=/aai/v11/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} + +# vlans +org.onap.ccsdk.sli.adaptors.aai.path.vlan=/aai/v11/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.onap.ccsdk.sli.adaptors.aai.path.generic.vnf.vlan=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface} + +# l3-interface-ipv4-address-list +org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv4.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} +org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv4.address.list=/aai/v11/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.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv6.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} +org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv6.address.list=/aai/v11/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.onap.ccsdk.sli.adaptors.aai.path.ipsec.configuration=/aai/v11/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id} + +# vig server +org.onap.ccsdk.sli.adaptors.aai.path.vig.server=/aai/v11/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers/vig-server/{vig-address-type} + +# l3-network +org.onap.ccsdk.sli.adaptors.aai.path.l3.network=/aai/v11/network/l3-networks/l3-network/{network-id} + +# subnet +org.onap.ccsdk.sli.adaptors.aai.path.subnet=/aai/v11/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id} + +# multicast-configuration +org.onap.ccsdk.sli.adaptors.aai.path.multicast.configuration=/aai/v11/network/multicast-configurations/multicast-configuration/{multicast-configuration-id} + +# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.ipv4.address.list +org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.ipv4.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} + +# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.vlan.ipv4.address.list +org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.vlan.ipv4.address.list=/aai/v11/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.onap.ccsdk.sli.adaptors.aai.path.l.interface.ipv6.address.list +org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.ipv6.address.list=/aai/v11/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.onap.ccsdk.sli.adaptors.aai.path.volume.group=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups/volume-group/{volume-group-id} + +#cloud region +org.onap.ccsdk.sli.adaptors.aai.path.cloud.region=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id} + +# vf-module +org.onap.ccsdk.sli.adaptors.aai.path.vf.module=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id} + +# l-interface through generic-vnf +org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf.linterface=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name} + +# network-policy +org.onap.ccsdk.sli.adaptors.aai.path.network.policy=/aai/v11/network/network-policies/network-policy/{network-policy-id} + +# pnf +org.onap.ccsdk.sli.adaptors.aai.path.pnf=/aai/v11/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 +org.onap.ccsdk.sli.adaptors.aai.param.format=filter=%s:%s +org.onap.ccsdk.sli.adaptors.aai.param.vnf_type=vnf-type +org.onap.ccsdk.sli.adaptors.aai.param.physical.location.id=physical-location-id +org.onap.ccsdk.sli.adaptors.aai.param.service.type=service-type diff --git a/kubernetes/config/docker/init/src/config/sdnc/conf/admportal.json b/kubernetes/config/docker/init/src/config/sdnc/conf/admportal.json index fc7f0e482d..f6f59ae797 100755 --- a/kubernetes/config/docker/init/src/config/sdnc/conf/admportal.json +++ b/kubernetes/config/docker/init/src/config/sdnc/conf/admportal.json @@ -25,7 +25,7 @@ "docker0": "172.17.0.1", "virbr0": "192.168.122.1" }, - "svclogicPropertiesDb01": "/opt/openecomp/sdnc/data/properties/svclogic.properties.sdnctldb01", + "svclogicPropertiesDb01": "/opt/onap/sdnc/data/properties/svclogic.properties.sdnctldb01", "databases": [ "dbhost|sdnctldb01" ], diff --git a/kubernetes/oneclick/aaf.sh b/kubernetes/oneclick/aaf.sh deleted file mode 100644 index 9a85300722..0000000000 --- a/kubernetes/oneclick/aaf.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "AAF....\n" - -$KUBECTL_CMD/aaf-deployment.yaml -$KUBECTL_CMD/aaf-cs-deployment.yaml diff --git a/kubernetes/oneclick/aai.sh b/kubernetes/oneclick/aai.sh deleted file mode 100755 index 9a8e837093..0000000000 --- a/kubernetes/oneclick/aai.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "AAI....\n" -$KUBECTL_CMD/hbase-deployment.yaml -$KUBECTL_CMD/aai-deployment.yaml -$KUBECTL_CMD/modelloader-deployment.yaml diff --git a/kubernetes/oneclick/appc.sh b/kubernetes/oneclick/appc.sh deleted file mode 100755 index 2db7b210b2..0000000000 --- a/kubernetes/oneclick/appc.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "App-c....\n" -$KUBECTL_CMD/db-deployment.yaml -$KUBECTL_CMD/appc-deployment.yaml -$KUBECTL_CMD/dgbuilder-deployment.yaml diff --git a/kubernetes/oneclick/clamp.sh b/kubernetes/oneclick/clamp.sh deleted file mode 100644 index 2440ccce55..0000000000 --- a/kubernetes/oneclick/clamp.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "CLAMP....\n" - -$KUBECTL_CMD/clamp-maraidb-deployment.yaml -$KUBECTL_CMD/clamp-deployment.yaml diff --git a/kubernetes/oneclick/dcae.sh b/kubernetes/oneclick/dcae.sh deleted file mode 100755 index 5dd1a2f071..0000000000 --- a/kubernetes/oneclick/dcae.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# manual deployment order is mentioned - but we need to specify dependencies in the service -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "dcae....\n" -$KUBECTL_CMD/message-router/dcae-zookeeper.yaml -$KUBECTL_CMD/message-router/dcae-kafka.yaml -$KUBECTL_CMD/message-router/dcae-dmaap.yaml - -$KUBECTL_CMD/pgaas/pgaas.yaml - -$KUBECTL_CMD/dcae-collector-common-event.yaml -$KUBECTL_CMD/dcae-collector-dmaapbc.yaml -$KUBECTL_CMD/dcae-collector-pvs.yaml - -$KUBECTL_CMD/cdap/cdap0-dep.yaml -$KUBECTL_CMD/cdap/cdap1-dep.yaml -$KUBECTL_CMD/cdap/cdap2-dep.yaml diff --git a/kubernetes/oneclick/message-router.sh b/kubernetes/oneclick/message-router.sh deleted file mode 100755 index 0369fd1a18..0000000000 --- a/kubernetes/oneclick/message-router.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "Message Router....\n" -$KUBECTL_CMD/message-router-zookeeper.yaml -$KUBECTL_CMD/message-router-kafka.yaml -$KUBECTL_CMD/message-router-dmaap.yaml diff --git a/kubernetes/oneclick/mso.sh b/kubernetes/oneclick/mso.sh deleted file mode 100755 index 360f3b80d9..0000000000 --- a/kubernetes/oneclick/mso.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "MSO....\n" - -$KUBECTL_CMD/db-deployment.yaml -$KUBECTL_CMD/mso-deployment.yaml diff --git a/kubernetes/oneclick/policy.sh b/kubernetes/oneclick/policy.sh deleted file mode 100755 index 85e58f6468..0000000000 --- a/kubernetes/oneclick/policy.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "Policy....\n" - -$KUBECTL_CMD/dep-maria.yaml -$KUBECTL_CMD/dep-nexus.yaml -$KUBECTL_CMD/dep-pap.yaml -$KUBECTL_CMD/dep-pdp.yaml -$KUBECTL_CMD/dep-brmsgw.yaml -$KUBECTL_CMD/dep-pypdp.yaml -$KUBECTL_CMD/dep-drools.yaml diff --git a/kubernetes/oneclick/portal.sh b/kubernetes/oneclick/portal.sh deleted file mode 100755 index c1484859b3..0000000000 --- a/kubernetes/oneclick/portal.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "Portal....\n" -$KUBECTL_CMD/portal-mariadb-deployment.yaml -$KUBECTL_CMD/portal-apps-deployment.yaml -$KUBECTL_CMD/portal-widgets-deployment.yaml -$KUBECTL_CMD/portal-vnc-dep.yaml diff --git a/kubernetes/oneclick/robot.sh b/kubernetes/oneclick/robot.sh deleted file mode 100755 index 99a5748f7a..0000000000 --- a/kubernetes/oneclick/robot.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "Robot....\n" -$KUBECTL_CMD/robot-deployment.yaml diff --git a/kubernetes/oneclick/sdc.sh b/kubernetes/oneclick/sdc.sh deleted file mode 100755 index 72a85cbe4b..0000000000 --- a/kubernetes/oneclick/sdc.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "SDC....\n" -$KUBECTL_CMD/sdc-es.yaml -$KUBECTL_CMD/sdc-cs.yaml -$KUBECTL_CMD/sdc-kb.yaml -$KUBECTL_CMD/sdc-be.yaml -$KUBECTL_CMD/sdc-fe.yaml diff --git a/kubernetes/oneclick/sdnc.sh b/kubernetes/oneclick/sdnc.sh deleted file mode 100755 index d7390ba01b..0000000000 --- a/kubernetes/oneclick/sdnc.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "SDNC....\n" -$KUBECTL_CMD/db-deployment.yaml -$KUBECTL_CMD/sdnc-deployment.yaml -$KUBECTL_CMD/dgbuilder-deployment.yaml -$KUBECTL_CMD/web-deployment.yaml diff --git a/kubernetes/oneclick/vfc.sh b/kubernetes/oneclick/vfc.sh deleted file mode 100755 index 0199a2a31b..0000000000 --- a/kubernetes/oneclick/vfc.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "vfc....\n" -$KUBECTL_CMD/vfc-catalog-deployment.yaml -$KUBECTL_CMD/vfc-emsdriver-deployment.yaml -$KUBECTL_CMD/vfc-gvnfmdriver-deployment.yaml -$KUBECTL_CMD/vfc-hwvnfmdriver-deployment.yaml -$KUBECTL_CMD/vfc-jujudriver-deployment.yaml -$KUBECTL_CMD/vfc-nslcm-deployment.yaml -$KUBECTL_CMD/vfc-resmgr-deployment.yaml -$KUBECTL_CMD/vfc-vnflcm-deployment.yaml -$KUBECTL_CMD/vfc-vnfmgr-deployment.yaml -$KUBECTL_CMD/vfc-vnfres-deployment.yaml -$KUBECTL_CMD/vfc-workflow-deployment.yaml -$KUBECTL_CMD/vfc-ztesdncdriver-deployment.yaml -$KUBECTL_CMD/vfc-ztevmanagerdriver-deployment.yaml diff --git a/kubernetes/oneclick/vid.sh b/kubernetes/oneclick/vid.sh deleted file mode 100755 index b88a3fb4a8..0000000000 --- a/kubernetes/oneclick/vid.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "VID....\n" -$KUBECTL_CMD/vid-mariadb-deployment.yaml -$KUBECTL_CMD/vid-server-deployment.yaml diff --git a/kubernetes/oneclick/vnfsdk.sh b/kubernetes/oneclick/vnfsdk.sh deleted file mode 100644 index c2853f7e1e..0000000000 --- a/kubernetes/oneclick/vnfsdk.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -KUBECTL_CMD="kubectl --namespace $1-$2 $3 -f ../$2" - -printf "VNFSDK....\n" - -$KUBECTL_CMD/postgres-deployment.yaml -$KUBECTL_CMD/refrepo-deployment.yaml diff --git a/kubernetes/sdnc/templates/all-services.yaml b/kubernetes/sdnc/templates/all-services.yaml index 7223dfdcd7..687a6bb934 100644 --- a/kubernetes/sdnc/templates/all-services.yaml +++ b/kubernetes/sdnc/templates/all-services.yaml @@ -78,10 +78,13 @@ metadata: ]' spec: ports: - - name: "sdnc-port" + - name: "sdnc-port-8181" port: 8282 targetPort: 8181 nodePort: {{ .Values.nodePortPrefix }}02 + - name: "sdnc-port-8101" + port: 8201 + targetPort: 8101 type: NodePort selector: app: sdnc diff --git a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml index ba2008ab4a..0e2166e92a 100644 --- a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml +++ b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml @@ -45,12 +45,12 @@ spec: - command: - /bin/bash - -c - - cd /opt/openecomp/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait + - cd /opt/onap/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait env: - name: MYSQL_ROOT_PASSWORD value: openECOMP1.0 - name: SDNC_CONFIG_DIR - value: /opt/openecomp/sdnc/data/properties + value: /opt/onap/sdnc/data/properties image: {{ .Values.image.dgbuilderSdnc }} imagePullPolicy: {{ .Values.pullPolicy }} name: sdnc-dgbuilder-container diff --git a/kubernetes/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml index 8b4d0ebad6..95c282b602 100644 --- a/kubernetes/sdnc/templates/sdnc-deployment.yaml +++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml @@ -41,12 +41,12 @@ spec: spec: containers: - command: - - /opt/openecomp/sdnc/bin/startODL.sh + - /opt/onap/sdnc/bin/startODL.sh env: - name: MYSQL_ROOT_PASSWORD value: openECOMP1.0 - name: SDNC_CONFIG_DIR - value: /opt/openecomp/sdnc/data/properties + value: /opt/onap/sdnc/data/properties image: {{ .Values.image.sdnc }} imagePullPolicy: {{ .Values.pullPolicy }} name: sdnc-controller-container @@ -54,9 +54,9 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /opt/openecomp/sdnc/data/properties/aaiclient.properties + - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties name: sdnc-aaiclient-properties - - mountPath: /opt/openecomp/sdnc/data/properties/admportal.json + - mountPath: /opt/onap/sdnc/data/properties/admportal.json name: sdnc-admportal-json - mountPath: /var/log/onap name: sdnc-logs @@ -64,6 +64,7 @@ spec: name: sdnc-log-config ports: - containerPort: 8181 + - containerPort: 8101 readinessProbe: tcpSocket: port: 8181 diff --git a/kubernetes/sdnc/templates/web-deployment.yaml b/kubernetes/sdnc/templates/web-deployment.yaml index 4f7886dc9c..45e2e26df3 100644 --- a/kubernetes/sdnc/templates/web-deployment.yaml +++ b/kubernetes/sdnc/templates/web-deployment.yaml @@ -45,12 +45,12 @@ spec: - command: - /bin/bash - -c - - cd /opt/openecomp/sdnc/admportal/shell && ./start_portal.sh + - cd /opt/onap/sdnc/admportal/shell && ./start_portal.sh env: - name: MYSQL_ROOT_PASSWORD value: openECOMP1.0 - name: SDNC_CONFIG_DIR - value: /opt/openecomp/sdnc/data/properties + value: /opt/onap/sdnc/data/properties image: {{ .Values.image.admportalSdnc }} imagePullPolicy: {{ .Values.pullPolicy }} name: sdnc-portal-container @@ -60,6 +60,10 @@ spec: - name: localtime mountPath: /etc/localtime readOnly: true + - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties + name: sdnc-aaiclient-properties + - mountPath: /opt/onap/sdnc/data/properties/admportal.json + name: sdnc-admportal-json readinessProbe: tcpSocket: port: 8843 @@ -70,5 +74,11 @@ spec: - name: localtime hostPath: path: /etc/localtime + - 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/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 20d045807e..f7cbecab9f 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -4,7 +4,7 @@ nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 mysqlServer: mysql/mysql-server:5.6 - dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest - sdnc: nexus3.onap.org:10001/openecomp/sdnc-image:1.1-STAGING-latest - admportalSdnc: nexus3.onap.org:10001/openecomp/admportal-sdnc-image:1.1-STAGING-latest + dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:0.1-STAGING-latest + sdnc: nexus3.onap.org:10001/onap/sdnc-image:1.2-STAGING-latest + admportalSdnc: nexus3.onap.org:10001/onap/admportal-sdnc-image:1.2-STAGING-latest filebeat: docker.elastic.co/beats/filebeat:5.5.0
\ No newline at end of file diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml index 9a6f6f25a9..b1e8b1fe8a 100755 --- a/kubernetes/vfc/templates/all-services.yaml +++ b/kubernetes/vfc/templates/all-services.yaml @@ -5,6 +5,17 @@ metadata: app: vfc-nslcm name: vfc-nslcm namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "nslcm", + "version": "v1", + "url": "/api/nslcm/v1", + "protocol": "REST", + "port": "{{.Values.nslcm.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-nslcm @@ -22,6 +33,17 @@ metadata: app: vfc-resmgr name: vfc-resmgr namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "resmgr", + "version": "v1", + "url": "/api/resmgr/v1", + "protocol": "REST", + "port": "{{.Values.resmgr.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-resmgr @@ -39,6 +61,17 @@ metadata: app: vfc-gvnfmdriver name: vfc-gvnfmdriver namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "gvnfmdriver", + "version": "v1", + "url": "/api/gvnfmdriver/v1", + "protocol": "REST", + "port": "{{.Values.gvnfmdriver.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-gvnfmdriver @@ -56,6 +89,17 @@ metadata: app: vfc-ztevmanagerdriver name: vfc-ztevmanagerdriver namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "ztevmanagerdriver", + "version": "v1", + "url": "/api/ztevmanagerdriver/v1", + "protocol": "REST", + "port": "{{.Values.ztevmanagerdriver.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-ztevmanagerdriver @@ -73,6 +117,17 @@ metadata: app: vfc-hwvnfmdriver name: vfc-hwvnfmdriver namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "huaweivnfmdriver", + "version": "v1", + "url": "/api/huaweivnfmdriver/v1", + "protocol": "REST", + "port": "{{.Values.hwvnfmdriver.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-ztevmanagerdriver @@ -90,6 +145,17 @@ metadata: app: vfc-ztesdncdriver name: vfc-ztesdncdriver namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "ztesdncdriver", + "version": "v1", + "url": "/api/ztesdncdriver/v1", + "protocol": "REST", + "port": "{{.Values.ztesdncdriver.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-ztesdncdriver @@ -107,6 +173,17 @@ metadata: app: vfc-jujudriver name: vfc-jujudriver namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "jujuvnfmdriver", + "version": "v1", + "url": "/api/jujuvnfmdriver/v1", + "protocol": "REST", + "port": "{{.Values.jujudriver.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-jujudriver @@ -124,6 +201,17 @@ metadata: app: vfc-vnflcm name: vfc-vnflcm namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "vnflcm", + "version": "v1", + "url": "/api/vnflcm/v1", + "protocol": "REST", + "port": "{{.Values.vnflcm.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-vnflcm @@ -141,6 +229,17 @@ metadata: app: vfc-vnfres name: vfc-vnfres namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "vnfres", + "version": "v1", + "url": "/api/vnfres/v1", + "protocol": "REST", + "port": "{{.Values.vnfres.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-vnfres @@ -158,6 +257,17 @@ metadata: app: vfc-vnfmgr name: vfc-vnfmgr namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "vnfmgr", + "version": "v1", + "url": "/api/vnfmgr/v1", + "protocol": "REST", + "port": "{{.Values.vnfmgr.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-vnfmgr @@ -175,6 +285,17 @@ metadata: app: vfc-emsdriver name: vfc-emsdriver namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "emsdriver", + "version": "v1", + "url": "/api/emsdriver/v1", + "protocol": "REST", + "port": "{{.Values.emsdriver.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-emsdriver @@ -191,6 +312,17 @@ metadata: app: vfc-workflow name: vfc-workflow namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "workflow", + "version": "v1", + "url": "/api/workflow/v1", + "protocol": "REST", + "port": "{{.Values.workflow.port}}", + "visualRange":"1" + } + ]' spec: ports: - name: vfc-workflow @@ -208,6 +340,17 @@ metadata: app: vfc-catalog name: vfc-catalog namespace: "{{ .Values.nsPrefix }}-vfc" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "catalog", + "version": "v1", + "url": "/api/catalog/v1", + "protocol": "REST", + "port": "{{.Values.catalog.port}}", + "visualRange":"1" + } + ] spec: ports: - name: vfc-catalog |