Browse Source

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
tags/7.0.0.0b3
Nguyen Hai 10 months ago
parent
commit
c752d66a1c

+ 4
- 4
contrib/demos/tacker/deploy-tacker-demo View File

@@ -61,12 +61,12 @@ EOF
61 61
 
62 62
 function deploy {
63 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 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 67
     echo "Creating sample VNF"
68
-    VNFD_ID=$(tacker vnfd-list | awk '/kolla-sample-vnfd/ { print $2 }')
69
-    tacker vnf-create --vnfd-id ${VNFD_ID} kolla-sample-vnf
68
+    VNFD_ID=$(openstack vnf descriptor list | awk '/kolla-sample-vnfd/ { print $2 }')
69
+    openstack vnf create --vnfd-id ${VNFD_ID} kolla-sample-vnf
70 70
 }
71 71
 
72 72
 gen_config

+ 2
- 2
contrib/demos/tacker/deploy-tacker-demo-sfc View File

@@ -63,9 +63,9 @@ function deploy_sfc {
63 63
     create_servers
64 64
     sfc_gen_config
65 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 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 69
     echo "Tacker sfc client floating ip address: $FLOATING_IP_CLIENT"
70 70
     echo "Tacker sfc server floating ip address: $FLOATING_IP_SERVER"
71 71
     cat << EOF

+ 5
- 5
doc/source/reference/tacker-guide.rst View File

@@ -99,7 +99,7 @@ Create base neutron networks and glance images.
99 99
 
100 100
 .. code-block:: console
101 101
 
102
-   $ sh tools/init-runonce
102
+   $ ./tools/init-runonce
103 103
 
104 104
 .. end
105 105
 
@@ -129,7 +129,7 @@ Execute ``deploy-tacker-demo`` script to initialize the VNF creation.
129 129
 
130 130
 .. code-block:: console
131 131
 
132
-   $ sh deploy-tacker-demo
132
+   $ ./deploy-tacker-demo
133 133
 
134 134
 .. end
135 135
 
@@ -145,10 +145,10 @@ Verify tacker VNF status is ACTIVE.
145 145
 
146 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 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 189
 .. code-block:: console
190 190
 
191
-   $ sh cleanup-tacker
191
+   $ ./cleanup-tacker
192 192
 
193 193
 .. end

Loading…
Cancel
Save