From b7b60ae85d391618c0f982e75e1502c58bb7624d Mon Sep 17 00:00:00 2001
From: Manikantha Srinivas Tadi <manikantha.tadi@gmail.com>
Date: Thu, 11 Aug 2016 05:34:57 -0400
Subject: [PATCH] Make Name parameter positional argument in DOCs and devstack
 lib

Name is made as mandatory and positional argument in getting started &
manual installation docs.

Also updated the devstack lib.

Change-Id: I5bd87925fc7ee89fdd44f873818d55fdd81611ac
Partial-Bug: #1474966
---
 devstack/lib/tacker                                  | 2 +-
 doc/source/devref/multisite_vim_usage_guide.rst      | 4 ++--
 doc/source/devref/vnfd_template_parameterization.rst | 2 +-
 doc/source/install/getting_started.rst               | 4 ++--
 doc/source/install/manual_installation.rst           | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/devstack/lib/tacker b/devstack/lib/tacker
index 60fca2efe..b6b44fad2 100644
--- a/devstack/lib/tacker
+++ b/devstack/lib/tacker
@@ -399,7 +399,7 @@ function tacker_register_default_vim {
     get_or_add_user_project_role "admin" $DEFAULT_VIM_USER $DEFAULT_VIM_PROJECT_NAME
     get_or_add_user_project_role "advsvc" $DEFAULT_VIM_USER $DEFAULT_VIM_PROJECT_NAME
     VIM_CONFIG_FILE="$TACKER_DIR/devstack/vim_config.yaml"
-    default_vim_id=$(tacker vim-register --is-default --name $DEFAULT_VIM_NAME --config-file $VIM_CONFIG_FILE -f value -c id)
+    default_vim_id=$(tacker vim-register --is-default --config-file $VIM_CONFIG_FILE $DEFAULT_VIM_NAME -f value -c id)
     echo $default_vim_id
 }
 
diff --git a/doc/source/devref/multisite_vim_usage_guide.rst b/doc/source/devref/multisite_vim_usage_guide.rst
index 9812a6396..24550b33a 100644
--- a/doc/source/devref/multisite_vim_usage_guide.rst
+++ b/doc/source/devref/multisite_vim_usage_guide.rst
@@ -37,7 +37,7 @@ To register a new OpenStack VIM inside Tacker
 
 ::
 
- $ tacker vim-register --name Site1 --description 'OpenStack Liberty' --config-file vim_config.yaml
+ $ tacker vim-register --description 'OpenStack Liberty' --config-file vim_config.yaml Site1
  Created a new vim:
  +----------------+----------------------------------------------------------------------------------------------------------------------------------------------------------+
  | Field          | Value                                                                                                                                                    |
@@ -79,7 +79,7 @@ Deploying a new VNF on registered VIM
 
 ::
 
- $ tacker vnf-create --name openwrt_VNF --description 'Openwrt VNF on Site1' --vnfd-id c3cbf0c0-a492-49e3-9541-945e49e7ed7e --vim-name Site1
+ $ tacker vnf-create --description 'Openwrt VNF on Site1' --vnfd-id c3cbf0c0-a492-49e3-9541-945e49e7ed7e --vim-name Site1 openwrt_VNF
  Created a new vnf:
  +----------------+--------------------------------------+
  | Field          | Value                                |
diff --git a/doc/source/devref/vnfd_template_parameterization.rst b/doc/source/devref/vnfd_template_parameterization.rst
index 45f5cf57e..6bdf2fa4b 100644
--- a/doc/source/devref/vnfd_template_parameterization.rst
+++ b/doc/source/devref/vnfd_template_parameterization.rst
@@ -217,7 +217,7 @@ Key Summary
 - An example of a vnf-create python-tackerclient command specifying a
   parameterized template and parameter values file would like below:
   "tacker vnf-create --vnfd-name <vnfd_name> --param-file <param_yaml_file>
-  --name <vnf_name>"
+  <vnf_name>"
 - Specifying a parameter values file during VNF creation is also supported in
   Horizon UI.
 - Sample VNFD parameterized templates and parameter values files can be found
diff --git a/doc/source/install/getting_started.rst b/doc/source/install/getting_started.rst
index b8ed96098..96a446c36 100644
--- a/doc/source/install/getting_started.rst
+++ b/doc/source/install/getting_started.rst
@@ -58,14 +58,14 @@ ii). Create a sample vnfd.
 
 .. code-block:: console
 
-    tacker vnfd-create --name <NAME> --vnfd-file sample-vnfd.yml
+    tacker vnfd-create --vnfd-file sample-vnfd.yml <NAME>
 ..
 
 iii). Create a VNF.
 
 .. code-block:: console
 
-    tacker vnf-create --name <NAME> --vnfd-id <VNFD_ID>
+    tacker vnf-create --vnfd-id <VNFD_ID> <NAME>
 ..
 
 iv). Check the status.
diff --git a/doc/source/install/manual_installation.rst b/doc/source/install/manual_installation.rst
index 0dff7085e..c77a4eb92 100644
--- a/doc/source/install/manual_installation.rst
+++ b/doc/source/install/manual_installation.rst
@@ -312,8 +312,7 @@ the user during vnf-create.
 .. code-block:: console
 
     tacker vim-register --is-default --config-file config.yaml \
-        --name <Default VIM name> --description <Default VIM description>
-..
+    --description <Default VIM description> <Default VIM Name>
 
 config.yaml will contain VIM specific parameters as below: