From c752d66a1c5296ccc1199c3cea77b7f528ea1ab7 Mon Sep 17 00:00:00 2001
From: Nguyen Hai <nguyentrihai93@gmail.com>
Date: Tue, 24 Jul 2018 11:50:50 +0900
Subject: [PATCH] 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 ++--
doc/source/reference/tacker-guide.rst | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/contrib/demos/tacker/deploy-tacker-demo b/contrib/demos/tacker/deploy-tacker-demo
index d3f6c84e7e..990c3e3349 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 06d1502837..8741d8d64c 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
diff --git a/doc/source/reference/tacker-guide.rst b/doc/source/reference/tacker-guide.rst
index c1c9bc8706..7977a80ce9 100644
--- a/doc/source/reference/tacker-guide.rst
+++ b/doc/source/reference/tacker-guide.rst
@@ -99,7 +99,7 @@ Create base neutron networks and glance images.
.. code-block:: console
- $ sh tools/init-runonce
+ $ ./tools/init-runonce
.. end
@@ -129,7 +129,7 @@ Execute ``deploy-tacker-demo`` script to initialize the VNF creation.
.. code-block:: console
- $ sh deploy-tacker-demo
+ $ ./deploy-tacker-demo
.. end
@@ -145,10 +145,10 @@ Verify tacker VNF status is ACTIVE.
.. code-block:: console
- $ tacker vnf-list
+ $ openstack vnf list
+--------------------------------------+------------------+-----------------------+--------+--------------------------------------+--------------------------------------+
- | id | name | mgmt_url | status | vim_id | vnfd_id |
+ | ID | Name | Mgmt Url | Status | VIM ID | VNFD ID |
+--------------------------------------+------------------+-----------------------+--------+--------------------------------------+--------------------------------------+
| c52fcf99-101d-427b-8a2d-c9ef54af8b1d | kolla-sample-vnf | {"VDU1": "10.0.0.10"} | ACTIVE | eb3aa497-192c-4557-a9d7-1dff6874a8e6 | 27e8ea98-f1ff-4a40-a45c-e829e53b3c41 |
+--------------------------------------+------------------+-----------------------+--------+--------------------------------------+--------------------------------------+
@@ -188,6 +188,6 @@ can be cleaned up executing ``cleanup-tacker`` script.
.. code-block:: console
- $ sh cleanup-tacker
+ $ ./cleanup-tacker
.. end
--
GitLab