diff options
| author |   Marco Platania <platania@research.att.com> | 2018-08-06 14:40:21 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2018-08-06 14:40:21 -0400 |
| commit | 20f5aa7a719b76babe5b566098407a594db3641c (patch) | |
| tree | 08a9b053488fcbfd1081921cbcc5d4e2e976c66d | |
| parent | b9a2a29a9e1e93cd04bfa46f9ed66a2117ef56e5 (diff) | |
Refactor ONAP HEAT template config, part 3
- Consolidate serv.sh activation in generic config script
- Rename OPEN-O (open-o) -> MULTISERV (multiserv)
- Resurce names in Heat template
- File names
- References in other installation scripts
- Rename dcae_c_ -> dcae_ in Heat template
- Minor clean up
Change-Id: If45a1f1e01933f828aa698c815e0a3f65810a208
Issue-ID: INT-526
Signed-off-by: Marco Platania <platania@research.att.com>
31 files changed, 208 insertions, 294 deletions
diff --git a/boot/bind_zones b/boot/bind_zones index 168ed042..dd8a8907 100644 --- a/boot/bind_zones +++ b/boot/bind_zones @@ -82,7 +82,7 @@ vm1.aaf-sms.simpledemo.openecomp.org. IN A sms_ip_addr vm1.mr.simpledemo.openecomp.org. IN A mr_ip_addr -vm1.openo.simpledemo.openecomp.org. IN A openo_ip_addr +vm1.multiserv.simpledemo.openecomp.org. IN A multiserv_ip_addr vm1.music.simpledemo.openecomp.org. IN A music_ip_addr @@ -141,13 +141,13 @@ sniro.api.simpledemo.openecomp.org. IN CNAME vm1.robot.simpledemo.openecomp.org. aaf.api.simpledemo.openecomp.org. IN CNAME vm1.aaf.simpledemo.openecomp.org. aaf-sms.api.simpledemo.openecomp.org. IN CNAME vm1.aaf-sms.simpledemo.openecomp.org. -;OPEN-O -msb.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. -mvim.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. -vnfsdk.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. -vfc.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. -uui.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. -esr.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. +;MultiService +msb.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. +mvim.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. +vnfsdk.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. +vfc.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. +uui.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. +esr.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. ;MUSIC music.api.simpledemo.openecomp.org. IN CNAME vm1.music.simpledemo.openecomp.org. diff --git a/boot/bind_zones_onap b/boot/bind_zones_onap index 2d6d5f26..a6b0275f 100644 --- a/boot/bind_zones_onap +++ b/boot/bind_zones_onap @@ -82,7 +82,7 @@ vm1.aaf-sms.simpledemo.onap.org. IN A sms_ip_addr vm1.mr.simpledemo.onap.org. IN A mr_ip_addr -vm1.openo.simpledemo.onap.org. IN A openo_ip_addr +vm1.multiserv.simpledemo.onap.org. IN A multiserv_ip_addr vm1.music.simpledemo.onap.org. IN A music_ip_addr @@ -141,13 +141,13 @@ sniro.api.simpledemo.onap.org. IN CNAME vm1.robot.simpledemo.onap.org. aaf.api.simpledemo.onap.org. IN CNAME vm1.aaf.simpledemo.onap.org. aaf-sms.api.simpledemo.onap.org. IN CNAME vm1.aaf-sms.simpledemo.onap.org. -;OPEN-O -msb.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. -mvim.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. -vnfsdk.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. -vfc.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. -uui.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. -esr.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. +;MultiService +msb.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. +mvim.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. +vnfsdk.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. +vfc.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. +uui.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. +esr.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. ;MUSIC music.api.simpledemo.onap.org. IN CNAME vm1.music.simpledemo.onap.org. diff --git a/boot/db_simpledemo_onap_org b/boot/db_simpledemo_onap_org index 2bb5a332..add2cab8 100644 --- a/boot/db_simpledemo_onap_org +++ b/boot/db_simpledemo_onap_org @@ -82,7 +82,7 @@ vm1.clamp.simpledemo.onap.org. IN A 10.0.12.1 c1.vm1.clamp.simpledemo.onap.org. IN A 10.0.12.1 c2.vm1.clamp.simpledemo.onap.org. IN A 10.0.12.1 -vm1.openo.simpledemo.onap.org. IN A 10.0.14.1 +vm1.multiserv.simpledemo.onap.org. IN A 10.0.14.1 vm1.music.simpledemo.onap.org. IN A 10.0.15.1 @@ -109,7 +109,7 @@ sdc.api.simpledemo.onap.org. IN CNAME vm1.sdc.simpledemo.onap.org. ;DCAE dcae.api.simpledemo.onap.org. IN CNAME vm1.dcae.simpledemo.onap.org. -;MSO +;SO mso.api.simpledemo.onap.org. IN CNAME vm1.mso.simpledemo.onap.org. so.api.simpledemo.onap.org. IN CNAME vm1.mso.simpledemo.onap.org. @@ -144,13 +144,13 @@ clamp.api.simpledemo.onap.org. IN CNAME vm1.clamp.simpledemo.onap.org. aaf.api.simpledemo.onap.org. IN CNAME vm1.aaf.simpledemo.onap.org. aaf-sms.api.simpledemo.onap.org. IN CNAME vm1.aaf-sms.simpledemo.onap.org. -;OPEN-O -msb.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. -mvim.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. -vnfsdk.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. -vfc.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. -uui.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. -esr.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. +;MultiService +msb.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. +mvim.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. +vnfsdk.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. +vfc.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. +uui.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. +esr.api.simpledemo.onap.org. IN CNAME vm1.multiserv.simpledemo.onap.org. ;MUSIC music.api.simpledemo.onap.org. IN CNAME vm1.music.simpledemo.onap.org. diff --git a/boot/db_simpledemo_openecomp_org b/boot/db_simpledemo_openecomp_org index 23409d11..dc9a43a6 100644 --- a/boot/db_simpledemo_openecomp_org +++ b/boot/db_simpledemo_openecomp_org @@ -81,7 +81,7 @@ vm1.clamp.simpledemo.openecomp.org. IN A 10.0.12.1 c1.vm1.clamp.simpledemo.openecomp.org. IN A 10.0.12.1 c2.vm1.clamp.simpledemo.openecomp.org. IN A 10.0.12.1 -vm1.openo.simpledemo.openecomp.org. IN A 10.0.14.1 +vm1.multiserv.simpledemo.openecomp.org. IN A 10.0.14.1 vm1.music.simpledemo.openecomp.org. IN A 10.0.15.1 @@ -108,7 +108,7 @@ sdc.api.simpledemo.openecomp.org. IN CNAME vm1.sdc.simpledemo.openecomp.org. ;DCAE dcae.api.simpledemo.openecomp.org. IN CNAME vm1.dcae.simpledemo.openecomp.org. -;MSO +;SO mso.api.simpledemo.openecomp.org. IN CNAME vm1.mso.simpledemo.openecomp.org. so.api.simpledemo.openecomp.org. IN CNAME vm1.mso.simpledemo.openecomp.org. @@ -142,13 +142,13 @@ clamp.api.simpledemo.openecomp.org. IN CNAME vm1.clamp.simpledemo.openecomp.org. ;AAF aaf.api.simpledemo.openecomp.org. IN CNAME vm1.aaf.simpledemo.openecomp.org. -;OPEN-O -msb.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. -mvim.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. -vnfsdk.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. -vfc.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. -uui.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. -esr.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org. +;MultiService +msb.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. +mvim.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. +vnfsdk.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. +vfc.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. +uui.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. +esr.api.simpledemo.openecomp.org. IN CNAME vm1.multiserv.simpledemo.openecomp.org. ;MUSIC music.api.simpledemo.openecomp.org. IN CNAME vm1.music.simpledemo.openecomp.org. diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh index 350e95b7..9a5b59b1 100755 --- a/boot/dcae2_vm_init.sh +++ b/boot/dcae2_vm_init.sh @@ -166,7 +166,7 @@ wait_for_multicloud_ready() # wait till MultiCloud up and ready local MCHOST - MCHOST=$(cat /opt/config/openo_ip_addr.txt) + MCHOST=$(cat /opt/config/multiserv_ip_addr.txt) local MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json" local MCMETHOD='-X GET' local MCRESP='200' @@ -195,7 +195,7 @@ register_multicloud_pod25dns_with_aai() CLOUD_REGION="$(cat /opt/config/dnsaas_region.txt)" CLOUD_ENV="$(cat /opt/config/cloud_env.txt)" - MCIP="$(cat /opt/config/openo_ip_addr.txt)" + MCIP="$(cat /opt/config/multiserv_ip_addr.txt)" CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0" local RESPCODE @@ -277,7 +277,7 @@ register_multicloud_pod25_with_aai() CLOUD_REGION="$(cat /opt/config/openstack_region.txt)" DNSAAS_CLOUD_REGION="$(cat /opt/config/dnsaas_region.txt)" CLOUD_ENV="$(cat /opt/config/cloud_env.txt)" - MCIP="$(cat /opt/config/openo_ip_addr.txt)" + MCIP="$(cat /opt/config/multiserv_ip_addr.txt)" CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0" KEYSTONE_URL="$(cat /opt/config/openstack_keystone_url.txt)" if [[ "$KEYSTONE_URL" == */v3 ]]; then @@ -405,7 +405,7 @@ register_dns_zone_proxied_designate() CLOUD_ENV="$(cat /opt/config/cloud_env.txt)" if [ -z "$1" ]; then DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)"; else DCAE_ZONE="$1"; fi DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)" - MCHOST=$(cat /opt/config/openo_ip_addr.txt) + MCHOST=$(cat /opt/config/multiserv_ip_addr.txt) MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json" MCDATA='-d "{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"' @@ -578,7 +578,7 @@ delete_dns_zone() CLOUD_ENV="$(cat /opt/config/cloud_env.txt)" DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)" DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)" - MCHOST=$(cat /opt/config/openo_ip_addr.txt) + MCHOST=$(cat /opt/config/multiserv_ip_addr.txt) MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json" local DCAE_DOMAIN @@ -623,7 +623,7 @@ list_dns_zone() CLOUD_ENV="$(cat /opt/config/cloud_env.txt)" DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)" DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)" - MCHOST=$(cat /opt/config/openo_ip_addr.txt) + MCHOST=$(cat /opt/config/multiserv_ip_addr.txt) MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json" MCDATA='"{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"' diff --git a/docker_upgrade_scripts/fabfile.py b/docker_upgrade_scripts/fabfile.py index 72e3e61a..f4c5726c 100755 --- a/docker_upgrade_scripts/fabfile.py +++ b/docker_upgrade_scripts/fabfile.py @@ -14,8 +14,8 @@ def upgrade_docker(server_name, my_env): execute_file = "/opt/mr_vm_init.sh" elif server_name in "dcae-controller": execute_file = "/opt/dcae2_vm_init.sh" - elif server_name in "openo-server": - execute_file = "/opt/openo_all_serv.sh" + elif server_name in "multiserv-server": + execute_file = "/opt/multiserv_all_serv.sh" elif server_name in "dns": execute_file = None else: diff --git a/heat/ONAP/cloud-config/aaf_install.sh b/heat/ONAP/cloud-config/aaf_install.sh index a164c042..2d6657ec 100644 --- a/heat/ONAP/cloud-config/aaf_install.sh +++ b/heat/ONAP/cloud-config/aaf_install.sh @@ -19,10 +19,6 @@ echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) apt-get update apt-get install --allow-unauthenticated -y openjdk-8-jdk maven -# Download scripts from Nexus -update-rc.d aaf_serv.sh defaults - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO diff --git a/heat/ONAP/cloud-config/aai_install.sh b/heat/ONAP/cloud-config/aai_install.sh index feaf7f3c..774b45a8 100644 --- a/heat/ONAP/cloud-config/aai_install.sh +++ b/heat/ONAP/cloud-config/aai_install.sh @@ -13,11 +13,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d aai_serv.sh defaults - - # Run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO diff --git a/heat/ONAP/cloud-config/appc_install.sh b/heat/ONAP/cloud-config/appc_install.sh index e9731f71..8c680ee8 100644 --- a/heat/ONAP/cloud-config/appc_install.sh +++ b/heat/ONAP/cloud-config/appc_install.sh @@ -12,11 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d appc_serv.sh defaults - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO appc diff --git a/heat/ONAP/cloud-config/clamp_install.sh b/heat/ONAP/cloud-config/clamp_install.sh index 1a45119c..653be903 100644 --- a/heat/ONAP/cloud-config/clamp_install.sh +++ b/heat/ONAP/cloud-config/clamp_install.sh @@ -12,11 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d clamp_serv.sh defaults - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO diff --git a/heat/ONAP/cloud-config/dcae2_install.sh b/heat/ONAP/cloud-config/dcae2_install.sh index a4fd556a..fbc8db3c 100644 --- a/heat/ONAP/cloud-config/dcae2_install.sh +++ b/heat/ONAP/cloud-config/dcae2_install.sh @@ -38,7 +38,6 @@ apt-get install -y python python-pip # Download scripts from Nexus cp /opt/boot/dcae2_vm_init.sh /opt/dcae2_vm_init.sh chmod +x /opt/dcae2_vm_init.sh -update-rc.d dcae2_serv.sh defaults echo "DOCKER_OPTS=\"\$DOCKER_OPTS --raw-logs -H tcp://0.0.0.0:2376 -H unix:///var/run/docker.sock\"" >> /etc/default/docker sed -i "/ExecStart/s/$/ -H tcp:\/\/0.0.0.0:2376 --raw-logs/g" /etc/systemd/system/docker.service diff --git a/heat/ONAP/cloud-config/dns_install.sh b/heat/ONAP/cloud-config/dns_install.sh index b277e6dc..ca6f5608 100644 --- a/heat/ONAP/cloud-config/dns_install.sh +++ b/heat/ONAP/cloud-config/dns_install.sh @@ -53,7 +53,7 @@ then sed -i "s/sdnc_ip_addr/"$(cat /opt/config/sdnc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/vid_ip_addr/"$(cat /opt/config/vid_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org - sed -i "s/openo_ip_addr/"$(cat /opt/config/openo_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org + sed -i "s/multiserv_ip_addr/"$(cat /opt/config/multiserv_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/music_ip_addr/"$(cat /opt/config/music_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/oof_ip_addr/"$(cat /opt/config/oof_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/aaf_ip_addr/"$(cat /opt/config/aaf_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org @@ -74,7 +74,7 @@ then sed -i "s/sdnc_ip_addr/"$(cat /opt/config/sdnc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org sed -i "s/vid_ip_addr/"$(cat /opt/config/vid_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org - sed -i "s/openo_ip_addr/"$(cat /opt/config/openo_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org + sed -i "s/multiserv_ip_addr/"$(cat /opt/config/multiserv_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org sed -i "s/music_ip_addr/"$(cat /opt/config/music_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org sed -i "s/oof_ip_addr/"$(cat /opt/config/oof_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org sed -i "s/aaf_ip_addr/"$(cat /opt/config/aaf_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org diff --git a/heat/ONAP/cloud-config/mr_install.sh b/heat/ONAP/cloud-config/mr_install.sh index f2906970..be49b972 100644 --- a/heat/ONAP/cloud-config/mr_install.sh +++ b/heat/ONAP/cloud-config/mr_install.sh @@ -12,14 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -# a) scripts for message router (mr) -update-rc.d mr_serv.sh defaults - -# b) scripts for bus controller (dbcl) - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO /opt/startup-vm-message-router diff --git a/heat/ONAP/cloud-config/msb_vm_init.sh b/heat/ONAP/cloud-config/msb_vm_init.sh index 938a3d6d..c43b1e82 100644 --- a/heat/ONAP/cloud-config/msb_vm_init.sh +++ b/heat/ONAP/cloud-config/msb_vm_init.sh @@ -30,167 +30,167 @@ sleep 20 # register ONAP services to MSB #aai #cloud-infrastructure -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v12", "url": "/aai/v12/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v13", "url": "/aai/v13/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v12", "url": "/aai/v12/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v13", "url": "/aai/v13/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","path": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v12", "url": "/aai/v12/cloud-infrastructure","path": "/aai/v12/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v13", "url": "/aai/v13/cloud-infrastructure","path": "/aai/v13/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","path": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v12", "url": "/aai/v12/cloud-infrastructure","path": "/aai/v12/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v13", "url": "/aai/v13/cloud-infrastructure","path": "/aai/v13/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #business -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v11", "url": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v12", "url": "/aai/v12/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v13", "url": "/aai/v13/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v11", "url": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v12", "url": "/aai/v12/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v13", "url": "/aai/v13/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v11", "url": "/aai/v11/business","path": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v12", "url": "/aai/v12/business","path": "/aai/v12/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v13", "url": "/aai/v13/business","path": "/aai/v13/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v11", "url": "/aai/v11/business","path": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v12", "url": "/aai/v12/business","path": "/aai/v12/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v13", "url": "/aai/v13/business","path": "/aai/v13/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #actions -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v11", "url": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v12", "url": "/aai/v12/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v13", "url": "/aai/v13/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v11", "url": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v12", "url": "/aai/v12/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v13", "url": "/aai/v13/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v11", "url": "/aai/v11/actions","path": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v12", "url": "/aai/v12/actions","path": "/aai/v12/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v13", "url": "/aai/v13/actions","path": "/aai/v13/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v11", "url": "/aai/v11/actions","path": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v12", "url": "/aai/v12/actions","path": "/aai/v12/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v13", "url": "/aai/v13/actions","path": "/aai/v13/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #service-design-and-creation -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v12", "url": "/aai/v12/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v13", "url": "/aai/v13/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v12", "url": "/aai/v12/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v13", "url": "/aai/v13/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","path": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v12", "url": "/aai/v12/service-design-and-creation","path": "/aai/v12/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v13", "url": "/aai/v13/service-design-and-creation","path": "/aai/v13/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","path": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v12", "url": "/aai/v12/service-design-and-creation","path": "/aai/v12/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v13", "url": "/aai/v13/service-design-and-creation","path": "/aai/v13/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #network -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v11", "url": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v12", "url": "/aai/v12/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v13", "url": "/aai/v13/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v11", "url": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v12", "url": "/aai/v12/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v13", "url": "/aai/v13/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v11", "url": "/aai/v11/network","path": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v12", "url": "/aai/v12/network","path": "/aai/v12/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v13", "url": "/aai/v13/network","path": "/aai/v13/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v11", "url": "/aai/v11/network","path": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v12", "url": "/aai/v12/network","path": "/aai/v12/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v13", "url": "/aai/v13/network","path": "/aai/v13/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #externalSystem -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v12", "url": "/aai/v12/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v13", "url": "/aai/v13/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v12", "url": "/aai/v12/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v13", "url": "/aai/v13/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","path": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v12", "url": "/aai/v12/external-system","path": "/aai/v12/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v13", "url": "/aai/v13/external-system","path": "/aai/v13/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","path": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v12", "url": "/aai/v12/external-system","path": "/aai/v12/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v13", "url": "/aai/v13/external-system","path": "/aai/v13/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #traversal #generic-query -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v11", "url": "/aai/v11/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v12", "url": "/aai/v12/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v13", "url": "/aai/v13/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v11", "url": "/aai/v11/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v12", "url": "/aai/v12/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v13", "url": "/aai/v13/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v11", "url": "/aai/v11/generic-query","path": "/aai/v11/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v12", "url": "/aai/v12/generic-query","path": "/aai/v12/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v13", "url": "/aai/v13/generic-query","path": "/aai/v13/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v11", "url": "/aai/v11/generic-query","path": "/aai/v11/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v12", "url": "/aai/v12/generic-query","path": "/aai/v12/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v13", "url": "/aai/v13/generic-query","path": "/aai/v13/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #nodes-query -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v11", "url": "/aai/v11/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v12", "url": "/aai/v12/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v13", "url": "/aai/v13/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v11", "url": "/aai/v11/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v12", "url": "/aai/v12/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v13", "url": "/aai/v13/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v11", "url": "/aai/v11/nodes-query","path": "/aai/v11/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v12", "url": "/aai/v12/nodes-query","path": "/aai/v12/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v13", "url": "/aai/v13/nodes-query","path": "/aai/v13/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v11", "url": "/aai/v11/nodes-query","path": "/aai/v11/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v12", "url": "/aai/v12/nodes-query","path": "/aai/v12/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v13", "url": "/aai/v13/nodes-query","path": "/aai/v13/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #query -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v11", "url": "/aai/v11/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v12", "url": "/aai/v12/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v13", "url": "/aai/v13/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v11", "url": "/aai/v11/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v12", "url": "/aai/v12/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v13", "url": "/aai/v13/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v11", "url": "/aai/v11/query","path": "/aai/v11/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v12", "url": "/aai/v12/query","path": "/aai/v12/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v13", "url": "/aai/v13/query","path": "/aai/v13/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v11", "url": "/aai/v11/query","path": "/aai/v11/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v12", "url": "/aai/v12/query","path": "/aai/v12/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v13", "url": "/aai/v13/query","path": "/aai/v13/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #named-query -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-named-query", "url": "/aai/search","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-named-query", "url": "/aai/search","path": "/aai/search","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-named-query", "url": "/aai/search","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-named-query", "url": "/aai/search","path": "/aai/search","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #search -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-search", "version": "v11", "url": "/aai/v11/search","protocol": "REST", "enable_ssl":"True", "lb_policy":"round-robin","nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-search", "version": "v11", "url": "/aai/v11/search","protocol": "REST", "enable_ssl":"True", "lb_policy":"round-robin","nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" # esr (not deployed together with AAI -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-server", "version": "v1", "url": "/api/aai-esr-server/v1","protocol": "REST", "enable_ssl":"true", "visualRange":"1", "nodes": [ {"ip": "'$OPENO_IP'","port": "9518"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-server", "version": "v1", "url": "/api/aai-esr-server/v1","protocol": "REST", "enable_ssl":"true", "visualRange":"1", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9518"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-gui", "version": "v1", "url": "/esr-gui","path": "/iui/aai-esr-gui","protocol": "UI", "nodes": [ {"ip": "'$OPENO_IP'","port": "9519"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-gui", "version": "v1", "url": "/esr-gui","path": "/iui/aai-esr-gui","protocol": "UI", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9519"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #so -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so", "version": "v1", "url": "/ecomp/mso/infra","protocol": "REST", "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so", "version": "v1", "url": "/ecomp/mso/infra","protocol": "REST", "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so-deprecated", "version": "v1", "url": "/ecomp/mso/infra","path": "/ecomp/mso/infra","protocol": "REST", "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so-deprecated", "version": "v1", "url": "/ecomp/mso/infra","path": "/ecomp/mso/infra","protocol": "REST", "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #Dmaap message router -#curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "message-router", "version": "v1", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$DMAAP_IP'","port": "3904"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +#curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "message-router", "version": "v1", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$DMAAP_IP'","port": "3904"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #policy -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp", "version": "v1", "url": "/pdp","protocol": "REST", "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp", "version": "v1", "url": "/pdp","protocol": "REST", "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp-deprecated", "version": "v1", "url": "/pdp","path": "/pdp","protocol": "REST", "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp-deprecated", "version": "v1", "url": "/pdp","path": "/pdp","protocol": "REST", "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #portal -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "portal", "version": "v2", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$PORTAL_IP'","port": "8989"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "portal", "version": "v2", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$PORTAL_IP'","port": "8989"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #sdc -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc", "version": "v1", "url": "/sdc/v1","protocol": "REST", "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc", "version": "v1", "url": "/sdc/v1","protocol": "REST", "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc-deprecated", "version": "v1", "url": "/sdc/v1","path": "/sdc/v1","protocol": "REST", "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc-deprecated", "version": "v1", "url": "/sdc/v1","path": "/sdc/v1","protocol": "REST", "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #sdnc -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc", "version": "v1", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc", "version": "v1", "url": "/","protocol": "REST", "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc-compatible", "version": "v1", "url": "/restconf","path": "/restconf","protocol": "REST", "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc-compatible", "version": "v1", "url": "/restconf","path": "/restconf","protocol": "REST", "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #multi-vim -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v0", "url": "/api/multicloud/v0","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "9001"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v0", "url": "/api/multicloud/v0","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9001"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-vio", "version": "v0", "url": "/api/multicloud-vio/v0","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "9004"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-vio", "version": "v0", "url": "/api/multicloud-vio/v0","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9004"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v0", "url": "/api/multicloud-ocata/v0","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "9006"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v0", "url": "/api/multicloud-ocata/v0","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9006"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titanium_cloud", "version": "v0", "url": "/api/multicloud-titanium_cloud/v0","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "9005"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titanium_cloud", "version": "v0", "url": "/api/multicloud-titanium_cloud/v0","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9005"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #VF-C -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nslcm", "version": "v1", "url": "/api/nslcm/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8403"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nslcm", "version": "v1", "url": "/api/nslcm/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8403"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztevnfmdriver", "version": "v1", "url": "/api/ztevnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8410"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztevnfmdriver", "version": "v1", "url": "/api/ztevnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8410"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztesdncdriver", "version": "v1", "url": "/api/ztesdncdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8411"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztesdncdriver", "version": "v1", "url": "/api/ztesdncdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8411"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "resmgr", "version": "v1", "url": "/api/resmgr/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8480"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "resmgr", "version": "v1", "url": "/api/resmgr/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8480"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "gvnfmdriver", "version": "v1", "url": "/api/gvnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8484"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "gvnfmdriver", "version": "v1", "url": "/api/gvnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8484"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "huaweivnfmdriver", "version": "v1", "url": "/api/huaweivnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8482"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "huaweivnfmdriver", "version": "v1", "url": "/api/huaweivnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8482"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nokiavnfmdriver", "version": "v1", "url": "/api/nokiavnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8485"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nokiavnfmdriver", "version": "v1", "url": "/api/nokiavnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8485"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "jujuvnfmdriver", "version": "v1", "url": "/api/jujuvnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8483"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "jujuvnfmdriver", "version": "v1", "url": "/api/jujuvnfmdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8483"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multivimproxy", "version": "v1", "url": "/api/multivimproxy/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8481"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multivimproxy", "version": "v1", "url": "/api/multivimproxy/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8481"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnflcm", "version": "v1", "url": "/api/vnflcm/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8801"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnflcm", "version": "v1", "url": "/api/vnflcm/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8801"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfres", "version": "v1", "url": "/api/vnfres/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8802"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfres", "version": "v1", "url": "/api/vnfres/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8802"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfmgr", "version": "v1", "url": "/api/vnfmgr/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8803"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfmgr", "version": "v1", "url": "/api/vnfmgr/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8803"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "activiti", "version": "v1", "url": "/activiti-rest", "path": "/activiti-rest" "protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8804"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "activiti", "version": "v1", "url": "/activiti-rest", "path": "/activiti-rest" "protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8804"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow", "version": "v1", "url": "/api/workflow/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8805"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow", "version": "v1", "url": "/api/workflow/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8805"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow-modeler", "version": "v1", "url": "/api/workflow-modeler/v1","protocol": "REST", "nodes": [ {"ip": "'$SDC_IP'","port": "9527"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow-modeler-ui", "version": "v1", "url": "/workflow-modeler","path": "/workflow-modeler","protocol": "UI", "nodes": [ {"ip": "'$SDC_IP'","port": "9527"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow-modeler", "version": "v1", "url": "/api/workflow-modeler/v1","protocol": "REST", "nodes": [ {"ip": "'$SDC_IP'","port": "9527"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow-modeler-ui", "version": "v1", "url": "/workflow-modeler","path": "/workflow-modeler","protocol": "UI", "nodes": [ {"ip": "'$SDC_IP'","port": "9527"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "catalog", "version": "v1", "url": "/api/catalog/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8806"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "catalog", "version": "v1", "url": "/api/catalog/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8806"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "NokiaSVNFM", "version": "v1", "url": "/api/NokiaSVNFM/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8089"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "NokiaSVNFM", "version": "v1", "url": "/api/NokiaSVNFM/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8089"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "emsdriver", "version": "v1", "url": "/api/emsdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8206"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "emsdriver", "version": "v1", "url": "/api/emsdriver/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8206"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" #UUI -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-server", "version": "v1", "url": "/api/usecaseui/server/v1","protocol": "REST", "nodes": [ {"ip": "'$OPENO_IP'","port": "8082"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-server", "version": "v1", "url": "/api/usecaseui/server/v1","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8082"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-ui", "version": "v1", "url": "/usecase-ui","path": "/iui/usecaseui","protocol": "UI", "nodes": [ {"ip": "'$OPENO_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-ui", "version": "v1", "url": "/usecase-ui","path": "/iui/usecaseui","protocol": "UI", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" # CLAMP -curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "clamp", "version": "v1", "url": "/restservices/clds/v1","protocol": "REST", "visualRange":"1", "nodes": [ {"ip": "'$CLAMP_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services" +curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "clamp", "version": "v1", "url": "/restservices/clds/v1","protocol": "REST", "visualRange":"1", "nodes": [ {"ip": "'$CLAMP_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services" diff --git a/heat/ONAP/cloud-config/openo_all_serv.sh b/heat/ONAP/cloud-config/multiserv_all_serv.sh index 57de2908..57de2908 100644 --- a/heat/ONAP/cloud-config/openo_all_serv.sh +++ b/heat/ONAP/cloud-config/multiserv_all_serv.sh diff --git a/heat/ONAP/cloud-config/openo_install.sh b/heat/ONAP/cloud-config/multiserv_install.sh index e9150a27..04871725 100644 --- a/heat/ONAP/cloud-config/openo_install.sh +++ b/heat/ONAP/cloud-config/multiserv_install.sh @@ -22,19 +22,18 @@ cp /opt/boot/msb_vm_init.sh /opt/msb_vm_init.sh cp /opt/boot/mvim_vm_init.sh /opt/mvim_vm_init.sh cp /opt/boot/vfc_vm_init.sh /opt/vfc_vm_init.sh cp /opt/boot/uui_vm_init.sh /opt/uui_vm_init.sh -cp /opt/boot/openo_all_serv.sh /opt/openo_all_serv.sh +cp /opt/boot/multiserv_all_serv.sh /opt/multiserv_all_serv.sh cp /opt/boot/esr_vm_init.sh /opt/esr_vm_init.sh chmod +x /opt/vnfsdk_vm_init.sh chmod +x /opt/msb_vm_init.sh chmod +x /opt/mvim_vm_init.sh chmod +x /opt/vfc_vm_init.sh chmod +x /opt/uui_vm_init.sh -chmod +x /opt/openo_all_serv.sh +chmod +x /opt/multiserv_all_serv.sh chmod +x /opt/esr_vm_init.sh -update-rc.d openo_serv.sh defaults # Clone Gerrit repository and run docker containers cd /opt git clone -b $VNFSDK_BRANCH --single-branch $VNFSDK_REPO source ./cli_install.sh -./openo_all_serv.sh +./multiserv_all_serv.sh diff --git a/heat/ONAP/cloud-config/music_install.sh b/heat/ONAP/cloud-config/music_install.sh index 38aaa71c..42cc01a3 100644 --- a/heat/ONAP/cloud-config/music_install.sh +++ b/heat/ONAP/cloud-config/music_install.sh @@ -12,11 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d music_serv.sh defaults - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO diff --git a/heat/ONAP/cloud-config/nbi_install.sh b/heat/ONAP/cloud-config/nbi_install.sh index 4e40f782..d7fce0fc 100644 --- a/heat/ONAP/cloud-config/nbi_install.sh +++ b/heat/ONAP/cloud-config/nbi_install.sh @@ -12,11 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d nbi_serv.sh defaults - - # Run docker containers cd /opt ./nbi_vm_init.sh diff --git a/heat/ONAP/cloud-config/oof_install.sh b/heat/ONAP/cloud-config/oof_install.sh index 15987442..c86aad86 100644 --- a/heat/ONAP/cloud-config/oof_install.sh +++ b/heat/ONAP/cloud-config/oof_install.sh @@ -12,11 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d oof_serv.sh defaults - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO optf-has diff --git a/heat/ONAP/cloud-config/policy_install.sh b/heat/ONAP/cloud-config/policy_install.sh index 43537c03..362b5827 100644 --- a/heat/ONAP/cloud-config/policy_install.sh +++ b/heat/ONAP/cloud-config/policy_install.sh @@ -12,11 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d policy_serv.sh defaults - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO policy diff --git a/heat/ONAP/cloud-config/portal_install.sh b/heat/ONAP/cloud-config/portal_install.sh index 7945d0e5..3bd9eeb1 100644 --- a/heat/ONAP/cloud-config/portal_install.sh +++ b/heat/ONAP/cloud-config/portal_install.sh @@ -12,11 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d portal_serv.sh defaults - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO diff --git a/heat/ONAP/cloud-config/robot_install.sh b/heat/ONAP/cloud-config/robot_install.sh index 3441dd85..90e72513 100644 --- a/heat/ONAP/cloud-config/robot_install.sh +++ b/heat/ONAP/cloud-config/robot_install.sh @@ -27,8 +27,5 @@ chmod +x /opt/demo.sh mkdir -p /opt/eteshare/logs -update-rc.d robot_serv.sh defaults - - # Run docker containers. ./robot_vm_init.sh diff --git a/heat/ONAP/cloud-config/sdc_install.sh b/heat/ONAP/cloud-config/sdc_install.sh index a77cdc92..caeff2f4 100644 --- a/heat/ONAP/cloud-config/sdc_install.sh +++ b/heat/ONAP/cloud-config/sdc_install.sh @@ -13,10 +13,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d sdc_serv.sh defaults - # Create partition and mount the external volume cp /opt/boot/sdc_ext_volume_partitions.txt /opt/sdc_ext_volume_partitions.txt diff --git a/heat/ONAP/cloud-config/sdnc_install.sh b/heat/ONAP/cloud-config/sdnc_install.sh index 3eae650d..1ab8987f 100644 --- a/heat/ONAP/cloud-config/sdnc_install.sh +++ b/heat/ONAP/cloud-config/sdnc_install.sh @@ -12,11 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d sdnc_serv.sh defaults - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO sdnc diff --git a/heat/ONAP/cloud-config/sms_install.sh b/heat/ONAP/cloud-config/sms_install.sh index 11617ea9..2dd83207 100644 --- a/heat/ONAP/cloud-config/sms_install.sh +++ b/heat/ONAP/cloud-config/sms_install.sh @@ -12,11 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d sms_serv.sh defaults - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO diff --git a/heat/ONAP/cloud-config/so_install.sh b/heat/ONAP/cloud-config/so_install.sh index 18995249..3a8f3fc2 100644 --- a/heat/ONAP/cloud-config/so_install.sh +++ b/heat/ONAP/cloud-config/so_install.sh @@ -13,11 +13,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d so_serv.sh defaults - - # Clone Gerrit repository and run docker containers. cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO test_lab diff --git a/heat/ONAP/cloud-config/so_vm_init.sh b/heat/ONAP/cloud-config/so_vm_init.sh index 58ee9921..fb19d1a3 100644 --- a/heat/ONAP/cloud-config/so_vm_init.sh +++ b/heat/ONAP/cloud-config/so_vm_init.sh @@ -8,7 +8,6 @@ OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt) OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt) export MSO_DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) -export OPENO_IP=$(cat /opt/config/openo_ip.txt) # Deployments in OpenStack require a keystone file if [ -e /opt/config/keystone.txt ] diff --git a/heat/ONAP/cloud-config/vid_install.sh b/heat/ONAP/cloud-config/vid_install.sh index a73a6832..23dbce73 100644 --- a/heat/ONAP/cloud-config/vid_install.sh +++ b/heat/ONAP/cloud-config/vid_install.sh @@ -12,11 +12,6 @@ then export https_proxy=$HTTPS_PROXY fi - -# Download scripts from Nexus -update-rc.d vid_serv.sh defaults - - # Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 3c49ea32..427a9ad8 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -86,7 +86,7 @@ parameters: sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 clamp_ip_addr: 10.0.12.1 - openo_ip_addr: 10.0.14.1 + multiserv_ip_addr: 10.0.14.1 music_ip_addr: 10.0.15.1 oof_ip_addr: 10.0.16.1 aaf_ip_addr: 10.0.13.1 diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 2f95e8bc..8603b7c6 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -99,7 +99,7 @@ parameters: nexus_password: type: string - description: Nexus Repository Password + description: Nexus Repository password artifacts_version: type: string @@ -207,7 +207,7 @@ parameters: type: string clamp_ip_addr: type: string - openo_ip_addr: + multiserv_ip_addr: type: string music_ip_addr: type: string @@ -697,6 +697,9 @@ resources: mkdir -p /opt/boot unzip $ZIP_NAME -d /opt/boot + # Enable autorestart when VM reboots + update-rc.d serv.sh defaults + # Download and install docker-engine echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | tee /etc/apt/sources.list.d/docker.list apt-get update @@ -800,7 +803,7 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __clamp_ip_addr__: { get_param: clamp_ip_addr } - __openo_ip_addr__: { get_param: openo_ip_addr } + __multiserv_ip_addr__: { get_param: multiserv_ip_addr } __music_ip_addr__: { get_param: music_ip_addr } __oof_ip_addr__: { get_param: oof_ip_addr } __aaf_ip_addr__: { get_param: aaf_ip_addr } @@ -825,7 +828,7 @@ resources: echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt - echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt + echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt @@ -880,7 +883,7 @@ resources: - path: /opt/aai_vm_init.sh permissions: '0755' content: { get_file: cloud-config/aai_vm_init.sh } - - path: /etc/init.d/aai_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -957,7 +960,7 @@ resources: - path: /opt/aai_vm_init.sh permissions: '0755' content: { get_file: cloud-config/aai_vm_init.sh } - - path: /etc/init.d/aai_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1035,7 +1038,7 @@ resources: - path: /opt/so_vm_init.sh permissions: '0755' content: { get_file: cloud-config/so_vm_init.sh } - - path: /etc/init.d/so_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1055,7 +1058,6 @@ resources: params: __keystone_url__: { get_param: keystone_url } __dmaap_topic__: { get_param: dmaap_topic } - __openo_ip__: { get_param: openo_ip_addr } __docker_version__: { get_param: so_docker } __gerrit_branch__: { get_param: so_branch } __so_repo__: { get_param: so_repo } @@ -1063,7 +1065,6 @@ resources: #!/bin/bash # Create configuration files - echo "__openo_ip__" > /opt/config/openo_ip.txt echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt ln -s /opt/config/openstack_tenant_id.txt /opt/config/tenant_id.txt echo "__keystone_url__" > /opt/config/keystone.txt @@ -1120,7 +1121,7 @@ resources: - path: /opt/dbcl_vm_init.sh permissions: '0755' content: { get_file: cloud-config/dbcl_vm_init.sh } - - path: /etc/init.d/mr_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1195,7 +1196,7 @@ resources: - path: /opt/robot_vm_init.sh permissions: '0755' content: { get_file: cloud-config/robot_vm_init.sh } - - path: /etc/init.d/robot_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1231,7 +1232,7 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __clamp_ip_addr__: { get_param: clamp_ip_addr } - __openo_ip_addr__: { get_param: openo_ip_addr } + __multiserv_ip_addr__: { get_param: multiserv_ip_addr } __music_ip_addr__: { get_param: music_ip_addr } __oof_ip_addr__: { get_param: oof_ip_addr } __aaf_ip_addr__: { get_param: aaf_ip_addr } @@ -1275,8 +1276,8 @@ resources: echo "__sdnc_ip_addr__" > /opt/config/sdnc_portal_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt - echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt - echo "__openo_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt + echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt + echo "__multiserv_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt echo "__oof_ip_addr__" > /opt/config/oof_homing_ip_addr.txt @@ -1346,7 +1347,7 @@ resources: - path: /opt/vid_vm_init.sh permissions: '0755' content: { get_file: cloud-config/vid_vm_init.sh } - - path: /etc/init.d/vid_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1421,7 +1422,7 @@ resources: - path: /opt/sdnc_vm_init.sh permissions: '0755' content: { get_file: cloud-config/sdnc_vm_init.sh } - - path: /etc/init.d/sdnc_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1510,7 +1511,7 @@ resources: - path: /opt/sdc_wfd_vm_init.sh permissions: '0755' content: { get_file: cloud-config/sdc_wfd_vm_init.sh } - - path: /etc/init.d/sdc_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1593,7 +1594,7 @@ resources: - path: /opt/portal_vm_init.sh permissions: '0755' content: { get_file: cloud-config/portal_vm_init.sh } - - path: /etc/init.d/portal_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1672,7 +1673,7 @@ resources: - path: /opt/policy_vm_init.sh permissions: '0755' content: { get_file: cloud-config/policy_vm_init.sh } - - path: /etc/init.d/policy_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1749,7 +1750,7 @@ resources: - path: /opt/appc_vm_init.sh permissions: '0755' content: { get_file: cloud-config/appc_vm_init.sh } - - path: /etc/init.d/appc_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1828,7 +1829,7 @@ resources: - path: /opt/clamp_vm_init.sh permissions: '0755' content: { get_file: cloud-config/clamp_vm_init.sh } - - path: /etc/init.d/clamp_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -1866,22 +1867,22 @@ resources: ./clamp_install.sh - # OPEN-O VM instantiation - openo_private_port: + # MultiService VM instantiation + multiserv_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: multiserv_ip_addr }}] security_groups: - { get_resource: onap_sg } - openo_floating_ip: + multiserv_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: openo_private_port } + port_id: { get_resource: multiserv_private_port } - openo_vm: + multiserv_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } @@ -1893,36 +1894,36 @@ resources: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: openo_private_port } + - port: { get_resource: multiserv_private_port } user_data_format: SOFTWARE_CONFIG - user_data: { get_resource: openo_vm_config } + user_data: { get_resource: multiserv_vm_config } - openo_vm_scripts: + multiserv_vm_scripts: type: OS::Heat::CloudConfig properties: cloud_config: write_files: - - path: /opt/openo_install.sh + - path: /opt/multiserv_install.sh permissions: '0755' - content: { get_file: cloud-config/openo_install.sh } + content: { get_file: cloud-config/multiserv_install.sh } - path: /opt/cli_install.sh permissions: '0755' content: { get_file: cloud-config/cli_install.sh } - - path: /etc/init.d/openo_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: params: - __vm_init_script__: openo_all_serv.sh + __vm_init_script__: multiserv_all_serv.sh template: get_file: cloud-config/serv.sh - openo_vm_config: + multiserv_vm_config: type: OS::Heat::MultipartMime properties: parts: - config: { get_resource: common_config_script } - - config: { get_resource: openo_vm_scripts } + - config: { get_resource: multiserv_vm_scripts } - config: str_replace: params: @@ -1940,7 +1941,7 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __clamp_ip_addr__: { get_param: clamp_ip_addr } - __openo_ip_addr__: { get_param: openo_ip_addr } + __multiserv_ip_addr__: { get_param: multiserv_ip_addr } __vnfsdk_branch__: { get_param: vnfsdk_branch } __msb_docker__: { get_param: msb_docker } __mvim_docker__: { get_param: mvim_docker } @@ -2010,14 +2011,14 @@ resources: echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt - echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt + echo "export MULTISERV_IP=__multiserv_ip_addr__" >> /opt/config/onap_ips.txt cd /opt - ./openo_install.sh + ./multiserv_install.sh # DCAE GEN 2 Controller instantiation - dcae_c_private_port: + dcae_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } @@ -2025,13 +2026,13 @@ resources: security_groups: - { get_resource: onap_sg } - dcae_c_floating_ip: + dcae_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: dcae_c_private_port } + port_id: { get_resource: dcae_private_port } - dcae_c_vm: + dcae_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } @@ -2043,13 +2044,11 @@ resources: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: dcae_c_private_port } - #security_groups: - # - { get_resource: onap_sg } + - port: { get_resource: dcae_private_port } user_data_format: SOFTWARE_CONFIG - user_data: { get_resource: dcae_c_vm_config } + user_data: { get_resource: dcae_vm_config } - dcae_c_vm_scripts: + dcae_vm_scripts: type: OS::Heat::CloudConfig properties: cloud_config: @@ -2057,7 +2056,7 @@ resources: - path: /opt/dcae2_install.sh permissions: '0755' content: { get_file: cloud-config/dcae2_install.sh } - - path: /etc/init.d/dcae2_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -2066,12 +2065,12 @@ resources: template: get_file: cloud-config/serv.sh - dcae_c_vm_config: + dcae_vm_config: type: OS::Heat::MultipartMime properties: parts: - config: { get_resource: common_config_script } - - config: { get_resource: dcae_c_vm_scripts } + - config: { get_resource: dcae_vm_scripts } - config: str_replace: params: @@ -2080,9 +2079,9 @@ resources: __docker_version__: { get_param: dcae_docker } # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs __dcae_deployment_profile__: { get_param: dcae_deployment_profile } - __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] } + __mac_addr__: { get_attr: [dcae_private_port, mac_address] } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + __dcae_float_ip__: { get_attr: [dcae_floating_ip, floating_ip_address] } __dns_forwarder__: { get_param: dns_forwarder } __dcae_domain__: { get_param: dcae_domain } # conf for VMs DCAE is to bringup @@ -2098,7 +2097,6 @@ resources: template: 'onap_sg_rand' params: rand: { get_resource: random-str } - #__dcaeos_security_group__: { get_attr: [onap_sg, name] } __dcaeos_username__: { get_param: openstack_username } __dcaeos_password__: { get_param: openstack_api_key } __dcaeos_key_name__: { get_resource: vm_key } @@ -2120,7 +2118,7 @@ resources: __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __sdc_ip_addr__: { get_param: sdc_ip_addr } - __openo_ip_addr__: { get_param: openo_ip_addr } + __multiserv_ip_addr__: { get_param: multiserv_ip_addr } __aai1_ip_addr__: { get_param: aai1_ip_addr } __aai2_ip_addr__: { get_param: aai2_ip_addr } # floating IPs @@ -2130,8 +2128,8 @@ resources: __mrouter_floating_ip_addr__: { get_attr: [mrouter_floating_ip, floating_ip_address] } __sdc_floating_ip_addr__: { get_attr: [sdc_floating_ip, floating_ip_address] } __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] } - __openo_floating_ip_addr__: { get_attr: [openo_floating_ip, floating_ip_address] } - __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + __multiserv_floating_ip_addr__: { get_attr: [multiserv_floating_ip, floating_ip_address] } + __dcae_floating_ip_addr__: { get_attr: [dcae_floating_ip, floating_ip_address] } # container versions __dcae_docker__: { get_param: dcae_docker } __dcae_snmptrap_docker__: { get_param: dcae_snmptrap_docker } @@ -2152,7 +2150,6 @@ resources: __holmes_em_docker__: { get_param: holmes_em_docker } __holmes_rm_docker__: { get_param: holmes_rm_docker } - template: | #!/bin/bash @@ -2166,7 +2163,6 @@ resources: echo "__dcae_deployment_profile__" > /opt/config/dcae_deployment_profile.txt echo "__mac_addr__" > /opt/config/mac_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt echo "__dcae_domain__" > /opt/config/dcae_domain.txt # conf for the OpenStack env where DCAE is deployed @@ -2199,8 +2195,8 @@ resources: echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt - echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt - echo "__openo_ip_addr__" > /opt/config/msb_ip_addr.txt + echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt + echo "__multiserv_ip_addr__" > /opt/config/msb_ip_addr.txt echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt # floating IPs @@ -2210,8 +2206,8 @@ resources: echo "__mrouter_floating_ip_addr__" > /opt/config/mrouter_floating_ip_addr.txt echo "__sdc_floating_ip_addr__" > /opt/config/sdc_floating_ip_addr.txt echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt - echo "__openo_floating_ip_addr__" > /opt/config/openo_floating_ip_addr.txt - echo "__dcae_c_floating_ip_addr__" > /opt/config/dcae_c_floating_ip_addr.txt + echo "__multiserv_floating_ip_addr__" > /opt/config/multiserv_floating_ip_addr.txt + echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt # container versions echo "__dcae_docker__" > /opt/config/dcae_docker.txt echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt @@ -2278,7 +2274,7 @@ resources: - path: /opt/music_vm_init.sh permissions: '0755' content: { get_file: cloud-config/music_vm_init.sh } - - path: /etc/init.d/music_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -2353,7 +2349,7 @@ resources: - path: /opt/oof_vm_init.sh permissions: '0755' content: { get_file: cloud-config/oof_vm_init.sh } - - path: /etc/init.d/oof_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -2434,7 +2430,7 @@ resources: - path: /opt/aaf_vm_init.sh permissions: '0755' content: { get_file: cloud-config/aaf_vm_init.sh } - - path: /etc/init.d/aaf_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -2511,7 +2507,7 @@ resources: - path: /opt/sms_vm_init.sh permissions: '0755' content: { get_file: cloud-config/sms_vm_init.sh } - - path: /etc/init.d/sms_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: @@ -2588,7 +2584,7 @@ resources: - path: /opt/nbi_vm_init.sh permissions: '0755' content: { get_file: cloud-config/nbi_vm_init.sh } - - path: /etc/init.d/nbi_serv.sh + - path: /etc/init.d/serv.sh permissions: '0755' content: str_replace: diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 2232bc04..e9c1cc19 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -86,7 +86,7 @@ parameters: sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 clamp_ip_addr: 10.0.12.1 - openo_ip_addr: 10.0.14.1 + multiserv_ip_addr: 10.0.14.1 music_ip_addr: 10.0.15.1 oof_ip_addr: 10.0.16.1 aaf_ip_addr: 10.0.13.1 |