From c752d66a1c5296ccc1199c3cea77b7f528ea1ab7 Mon Sep 17 00:00:00 2001 From: Nguyen Hai Date: Tue, 24 Jul 2018 11:50:50 +0900 Subject: Update tacker CLI to openstack CLI in tacker demo - Change to openstack CLI - Change the way to run demo from "sh" to "./" for matching with README.rst in tacker demo folder. Change-Id: I17b755cd8d52f594785ef13634bfa233e63841a7 --- contrib/demos/tacker/deploy-tacker-demo | 8 ++++---- contrib/demos/tacker/deploy-tacker-demo-sfc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'contrib') diff --git a/contrib/demos/tacker/deploy-tacker-demo b/contrib/demos/tacker/deploy-tacker-demo index d3f6c84e7..990c3e334 100644 --- a/contrib/demos/tacker/deploy-tacker-demo +++ b/contrib/demos/tacker/deploy-tacker-demo @@ -61,12 +61,12 @@ EOF function deploy { echo "Registering sample VIM" - tacker vim-register --is-default --config-file ./kolla-sample-vim.yaml --description "kolla sample vim" kolla-sample-vim + openstack vim register --config-file ./kolla-sample-vim.yaml --description "kolla sample vim" --is-default kolla-sample-vim echo "Creating sample VNFD" - tacker vnfd-create --vnfd-file ./kolla-sample-vnfd.yaml kolla-sample-vnfd + openstack vnf descriptor create --vnfd-file ./kolla-sample-vnfd.yaml kolla-sample-vnfd echo "Creating sample VNF" - VNFD_ID=$(tacker vnfd-list | awk '/kolla-sample-vnfd/ { print $2 }') - tacker vnf-create --vnfd-id ${VNFD_ID} kolla-sample-vnf + VNFD_ID=$(openstack vnf descriptor list | awk '/kolla-sample-vnfd/ { print $2 }') + openstack vnf create --vnfd-id ${VNFD_ID} kolla-sample-vnf } gen_config diff --git a/contrib/demos/tacker/deploy-tacker-demo-sfc b/contrib/demos/tacker/deploy-tacker-demo-sfc index 06d150283..8741d8d64 100644 --- a/contrib/demos/tacker/deploy-tacker-demo-sfc +++ b/contrib/demos/tacker/deploy-tacker-demo-sfc @@ -63,9 +63,9 @@ function deploy_sfc { create_servers sfc_gen_config echo "Creating VNFFGD" - tacker vnffgd-create --vnffgd-file kolla-sample-vnffgd.yaml kolla-sample-vnffgd + openstack vnf graph descriptor create --vnffgd-file kolla-sample-vnffgd.yaml kolla-sample-vnffgd echo "Creating VNFFG" - tacker vnffg-create --vnffgd-name kolla-sample-vnffgd kolla-sample-vnffg + openstack vnf graph create --vnffgd-name kolla-sample-vnffgd kolla-sample-vnffg echo "Tacker sfc client floating ip address: $FLOATING_IP_CLIENT" echo "Tacker sfc server floating ip address: $FLOATING_IP_SERVER" cat << EOF -- cgit v1.2.3