summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2018-09-03 10:37:28 +0000
committerBin Yang <bin.yang@windriver.com>2018-09-03 10:37:28 +0000
commita8383543f8ebc086eea258c4c92872e184713c19 (patch)
treee9c30b971a8f82931e686d358f347fede9bf4c59
parent1eef031636a08e8acf06115d48cbc4f76c1cdafe (diff)
Refactor MC WindRiver plugin namespace
Workaround the constraints of ISTIO which prohibits the usage of _ in the namespace Change-Id: If5d0ae33b4f7d47cc9f1234e92dbeef81fdeadd3 Issue-ID: MULTICLOUD-335 Signed-off-by: Bin Yang <bin.yang@windriver.com>
-rwxr-xr-xboot/dcae2_vm_init.sh18
-rw-r--r--boot/msb_vm_init.sh3
2 files changed, 11 insertions, 10 deletions
diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
index 9a5b59b1..29c2fa95 100755
--- a/boot/dcae2_vm_init.sh
+++ b/boot/dcae2_vm_init.sh
@@ -167,7 +167,7 @@ wait_for_multicloud_ready()
# wait till MultiCloud up and ready
local MCHOST
MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
- local MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
+ local MCURL="http://$MCHOST:9005/api/multicloud-titaniumcloud/v0/swagger.json"
local MCMETHOD='-X GET'
local MCRESP='200'
local MCHEADERS='-H "Real-Time: true" -H "Content-Type: application/json" -H "Accept: application/json"'
@@ -196,7 +196,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/multiserv_ip_addr.txt)"
- CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
+ CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titaniumcloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
local RESPCODE
DNSAAS_SERVICE_URL="$(cat /opt/config/dnsaas_keystone_url.txt)"
@@ -278,7 +278,7 @@ register_multicloud_pod25_with_aai()
DNSAAS_CLOUD_REGION="$(cat /opt/config/dnsaas_region.txt)"
CLOUD_ENV="$(cat /opt/config/cloud_env.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"
+ CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titaniumcloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
KEYSTONE_URL="$(cat /opt/config/openstack_keystone_url.txt)"
if [[ "$KEYSTONE_URL" == */v3 ]]; then
echo "$KEYSTONE_URL"
@@ -406,10 +406,10 @@ register_dns_zone_proxied_designate()
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/multiserv_ip_addr.txt)
- MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
+ MCURL="http://$MCHOST:9005/api/multicloud-titaniumcloud/v0/swagger.json"
MCDATA='-d "{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"'
- MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
+ MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titaniumcloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
### zone operations
# because all VM's use 10.0.100.1 as their first DNS server, the designate DNS server as seocnd, we need to use a
@@ -579,7 +579,7 @@ delete_dns_zone()
DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)"
DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)"
MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
- MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
+ MCURL="http://$MCHOST:9005/api/multicloud-titaniumcloud/v0/swagger.json"
local DCAE_DOMAIN
local ZONENAME
@@ -587,7 +587,7 @@ delete_dns_zone()
ZONENAME="${DCAE_ZONE}.${DCAE_DOMAIN}."
MCDATA='"{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"'
- MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
+ MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titaniumcloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
### Get Token
local TOKEN
@@ -624,10 +624,10 @@ list_dns_zone()
DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)"
DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)"
MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
- MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
+ MCURL="http://$MCHOST:9005/api/multicloud-titaniumcloud/v0/swagger.json"
MCDATA='"{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"'
- MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
+ MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titaniumcloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
### Get Token
local TOKEN
diff --git a/boot/msb_vm_init.sh b/boot/msb_vm_init.sh
index c43b1e82..7b9d7ffd 100644
--- a/boot/msb_vm_init.sh
+++ b/boot/msb_vm_init.sh
@@ -147,7 +147,8 @@ curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud
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": "'$MULTISERV_IP'","port": "9005"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titaniumcloud", "version": "v0", "url": "/api/multicloud-titaniumcloud/v0","protocol": "REST", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9005"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titaniumcloud", "version": "v1", "url": "/api/multicloud-titaniumcloud/v1","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": "'$MULTISERV_IP'","port": "8403"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"