Skip to content
Snippets Groups Projects
Commit c752d66a authored by Nguyen Hai's avatar Nguyen Hai
Browse files

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
parent 4b8f17cd
No related branches found
No related tags found
No related merge requests found
...@@ -61,12 +61,12 @@ EOF ...@@ -61,12 +61,12 @@ EOF
function deploy { function deploy {
echo "Registering sample VIM" 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" 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" echo "Creating sample VNF"
VNFD_ID=$(tacker vnfd-list | awk '/kolla-sample-vnfd/ { print $2 }') VNFD_ID=$(openstack vnf descriptor list | awk '/kolla-sample-vnfd/ { print $2 }')
tacker vnf-create --vnfd-id ${VNFD_ID} kolla-sample-vnf openstack vnf create --vnfd-id ${VNFD_ID} kolla-sample-vnf
} }
gen_config gen_config
......
...@@ -63,9 +63,9 @@ function deploy_sfc { ...@@ -63,9 +63,9 @@ function deploy_sfc {
create_servers create_servers
sfc_gen_config sfc_gen_config
echo "Creating VNFFGD" 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" 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 client floating ip address: $FLOATING_IP_CLIENT"
echo "Tacker sfc server floating ip address: $FLOATING_IP_SERVER" echo "Tacker sfc server floating ip address: $FLOATING_IP_SERVER"
cat << EOF cat << EOF
......
...@@ -99,7 +99,7 @@ Create base neutron networks and glance images. ...@@ -99,7 +99,7 @@ Create base neutron networks and glance images.
.. code-block:: console .. code-block:: console
$ sh tools/init-runonce $ ./tools/init-runonce
.. end .. end
...@@ -129,7 +129,7 @@ Execute ``deploy-tacker-demo`` script to initialize the VNF creation. ...@@ -129,7 +129,7 @@ Execute ``deploy-tacker-demo`` script to initialize the VNF creation.
.. code-block:: console .. code-block:: console
$ sh deploy-tacker-demo $ ./deploy-tacker-demo
.. end .. end
...@@ -145,10 +145,10 @@ Verify tacker VNF status is ACTIVE. ...@@ -145,10 +145,10 @@ Verify tacker VNF status is ACTIVE.
.. code-block:: console .. 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 | | 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. ...@@ -188,6 +188,6 @@ can be cleaned up executing ``cleanup-tacker`` script.
.. code-block:: console .. code-block:: console
$ sh cleanup-tacker $ ./cleanup-tacker
.. end .. end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment