summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyen Hai <nguyentrihai93@gmail.com>2018-07-24 11:50:50 +0900
committerNguyen Hai <nguyentrihai93@gmail.com>2018-07-24 07:02:48 +0000
commitc752d66a1c5296ccc1199c3cea77b7f528ea1ab7 (patch)
tree4d4083e12e311924dec0a7346984e394815cb266
parent4b8f17cd82037598fbb90c70111443fcb8670f63 (diff)
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
Notes
Notes (review): Code-Review+2: Eduardo Gonzalez <dabarren@gmail.com> Code-Review+2: Surya Prakash (spsurya) <singh.surya64mnnit@gmail.com> Workflow+1: Surya Prakash (spsurya) <singh.surya64mnnit@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 24 Jul 2018 10:18:43 +0000 Reviewed-on: https://review.openstack.org/585074 Project: openstack/kolla-ansible Branch: refs/heads/master
-rw-r--r--contrib/demos/tacker/deploy-tacker-demo8
-rw-r--r--contrib/demos/tacker/deploy-tacker-demo-sfc4
-rw-r--r--doc/source/reference/tacker-guide.rst10
3 files changed, 11 insertions, 11 deletions
diff --git a/contrib/demos/tacker/deploy-tacker-demo b/contrib/demos/tacker/deploy-tacker-demo
index d3f6c84..990c3e3 100644
--- a/contrib/demos/tacker/deploy-tacker-demo
+++ b/contrib/demos/tacker/deploy-tacker-demo
@@ -61,12 +61,12 @@ EOF
61 61
62function deploy { 62function deploy {
63 echo "Registering sample VIM" 63 echo "Registering sample VIM"
64 tacker vim-register --is-default --config-file ./kolla-sample-vim.yaml --description "kolla sample vim" kolla-sample-vim 64 openstack vim register --config-file ./kolla-sample-vim.yaml --description "kolla sample vim" --is-default kolla-sample-vim
65 echo "Creating sample VNFD" 65 echo "Creating sample VNFD"
66 tacker vnfd-create --vnfd-file ./kolla-sample-vnfd.yaml kolla-sample-vnfd 66 openstack vnf descriptor create --vnfd-file ./kolla-sample-vnfd.yaml kolla-sample-vnfd
67 echo "Creating sample VNF" 67 echo "Creating sample VNF"
68 VNFD_ID=$(tacker vnfd-list | awk '/kolla-sample-vnfd/ { print $2 }') 68 VNFD_ID=$(openstack vnf descriptor list | awk '/kolla-sample-vnfd/ { print $2 }')
69 tacker vnf-create --vnfd-id ${VNFD_ID} kolla-sample-vnf 69 openstack vnf create --vnfd-id ${VNFD_ID} kolla-sample-vnf
70} 70}
71 71
72gen_config 72gen_config
diff --git a/contrib/demos/tacker/deploy-tacker-demo-sfc b/contrib/demos/tacker/deploy-tacker-demo-sfc
index 06d1502..8741d8d 100644
--- a/contrib/demos/tacker/deploy-tacker-demo-sfc
+++ b/contrib/demos/tacker/deploy-tacker-demo-sfc
@@ -63,9 +63,9 @@ function deploy_sfc {
63 create_servers 63 create_servers
64 sfc_gen_config 64 sfc_gen_config
65 echo "Creating VNFFGD" 65 echo "Creating VNFFGD"
66 tacker vnffgd-create --vnffgd-file kolla-sample-vnffgd.yaml kolla-sample-vnffgd 66 openstack vnf graph descriptor create --vnffgd-file kolla-sample-vnffgd.yaml kolla-sample-vnffgd
67 echo "Creating VNFFG" 67 echo "Creating VNFFG"
68 tacker vnffg-create --vnffgd-name kolla-sample-vnffgd kolla-sample-vnffg 68 openstack vnf graph create --vnffgd-name kolla-sample-vnffgd kolla-sample-vnffg
69 echo "Tacker sfc client floating ip address: $FLOATING_IP_CLIENT" 69 echo "Tacker sfc client floating ip address: $FLOATING_IP_CLIENT"
70 echo "Tacker sfc server floating ip address: $FLOATING_IP_SERVER" 70 echo "Tacker sfc server floating ip address: $FLOATING_IP_SERVER"
71 cat << EOF 71 cat << EOF
diff --git a/doc/source/reference/tacker-guide.rst b/doc/source/reference/tacker-guide.rst
index c1c9bc8..7977a80 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.
99 99
100.. code-block:: console 100.. code-block:: console
101 101
102 $ sh tools/init-runonce 102 $ ./tools/init-runonce
103 103
104.. end 104.. end
105 105
@@ -129,7 +129,7 @@ Execute ``deploy-tacker-demo`` script to initialize the VNF creation.
129 129
130.. code-block:: console 130.. code-block:: console
131 131
132 $ sh deploy-tacker-demo 132 $ ./deploy-tacker-demo
133 133
134.. end 134.. end
135 135
@@ -145,10 +145,10 @@ Verify tacker VNF status is ACTIVE.
145 145
146.. code-block:: console 146.. code-block:: console
147 147
148 $ tacker vnf-list 148 $ openstack vnf list
149 149
150 +--------------------------------------+------------------+-----------------------+--------+--------------------------------------+--------------------------------------+ 150 +--------------------------------------+------------------+-----------------------+--------+--------------------------------------+--------------------------------------+
151 | id | name | mgmt_url | status | vim_id | vnfd_id | 151 | ID | Name | Mgmt Url | Status | VIM ID | VNFD ID |
152 +--------------------------------------+------------------+-----------------------+--------+--------------------------------------+--------------------------------------+ 152 +--------------------------------------+------------------+-----------------------+--------+--------------------------------------+--------------------------------------+
153 | c52fcf99-101d-427b-8a2d-c9ef54af8b1d | kolla-sample-vnf | {"VDU1": "10.0.0.10"} | ACTIVE | eb3aa497-192c-4557-a9d7-1dff6874a8e6 | 27e8ea98-f1ff-4a40-a45c-e829e53b3c41 | 153 | c52fcf99-101d-427b-8a2d-c9ef54af8b1d | kolla-sample-vnf | {"VDU1": "10.0.0.10"} | ACTIVE | eb3aa497-192c-4557-a9d7-1dff6874a8e6 | 27e8ea98-f1ff-4a40-a45c-e829e53b3c41 |
154 +--------------------------------------+------------------+-----------------------+--------+--------------------------------------+--------------------------------------+ 154 +--------------------------------------+------------------+-----------------------+--------+--------------------------------------+--------------------------------------+
@@ -188,6 +188,6 @@ can be cleaned up executing ``cleanup-tacker`` script.
188 188
189.. code-block:: console 189.. code-block:: console
190 190
191 $ sh cleanup-tacker 191 $ ./cleanup-tacker
192 192
193.. end 193.. end