diff --git a/README.md b/README.md
index 2f916c968be71557e82e2865d077cbb8d60bd8d0..5f6fe056386f7220cd41e783bf6323626792fdbd 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ List of supported Commands:
passwd Updates the current user's password.
Requires no capabilities.
- userlist Lists users (regex matching).
+ userlist Lists users (regex).
Requires USER_LIST user capability.
useradd Adds a user.
@@ -55,71 +55,71 @@ List of supported Commands:
usersetcaps Sets a user's capabilities.
Requires USER_SET_CAPS user capability.
- vmlist Lists VMs that can be listed (regex matching).
+ vmlist Lists VMs that can be listed (regex).
Requires VM_LIST VM access capability or VM_LIST_ANY user capability.
- vmliststart Lists VMs that can be started (regex matching).
+ vmliststart Lists VMs that can be started (regex).
Requires VM_START VM access capability or VM_START_ANY user capability.
- vmlistattach Lists VMs that can be attached to (regex matching).
+ vmlistattach Lists VMs that can be attached to (regex).
Requires VM_LIST VM access capability or VM_LIST_ANY user capability.
- vmliststop Lists VMs that can be stopped or shutdown (regex matching).
+ vmliststop Lists VMs that can be stopped or shutdown (regex).
Requires VM_STOP VM access capability or VM_STOP_ANY user capability.
- vmlistedit Lists VMs that can be edited (regex matching).
+ vmlistedit Lists VMs that can be edited (regex).
Requires VM_EDIT VM access capability or VM_EDIT_ANY user capability.
- vmlisteditaccess Lists VMs that can have their VM access edited (regex matching).
+ vmlisteditaccess Lists VMs that can have their VM access edited (regex).
Requires VM_SET_ACCESS user capability and VM_SET_ACCESS VM access capability.
- vmlistdel Lists VMs that can be deleted (regex matching).
+ vmlistdel Lists VMs that can be deleted (regex).
Requires VM_DESTROY VM access capability or VM_DESTROY_ANY user capability.
- vmlistexportdir List VMs that can have a directory exported (regex matching).
+ vmlistexportdir List VMs that can have a directory exported (regex).
Requires VM_READFS VM access capability or VM_READFS_ANY user capability.
- vmcred2pdf Creates a PDF with the credentials required to attach to running VMs (regex matching).
+ vmcred2pdf Creates a PDF with the credentials required to attach to running VMs (regex).
Requires VM_LIST VM access capability or VM_LIST_ANY user capability.
- vmstart Starts one or more VMs (regex matching).
+ vmstart Starts one or more VMs (regex).
Requires VM_START VM access capability or VM_START_ANY user capability.
- vmstop Stops by force one or more VMs (regex matching).
+ vmstop Stops by force one or more VMs (regex).
Requires VM_STOP VM access capability or VM_STOP_ANY user capability.
- vmshutdown Gracefully shutdowns one or more VMs (regex matching).
+ vmshutdown Gracefully shutdowns one or more VMs (regex).
Requires VM_STOP VM access capability or VM_STOP_ANY user capability.
- vmattach Attaches to one or more VMs in order to use their desktop environment (regex matching).
+ vmattach Attaches to one or more VMs in order to use their desktop environment (regex).
Requires VM_LIST VM access capability or VM_LIST_ANY user capability.
- vmcreate Creates one or more VMs (regex matching).
+ vmcreate Creates one or more VMs (regex).
Requires VM_CREATE user capability.
- vmedit Edits one or more VMs' properties: name, cpus, ram or nic (regex matching).
+ vmedit Edits one or more VMs' properties: name, cpus, ram or nic (regex).
Requires VM_EDIT VM access capability or VM_EDIT_ANY user capability.
- vmdel Deletes one or more VMs (regex matching).
+ vmdel Deletes one or more VMs (regex).
Requires VM_DESTROY VM access capability or VM_DESTROY_ANY user capability.
- vmsetaccess Sets a user's VM access in one or more VMs (regex matching).
+ vmsetaccess Sets a user's VM access in one or more VMs (regex).
Requires VM_SET_ACCESS user capability and VM_SET_ACCESS VM access capability.
- vmdelaccess Deletes a user's VM access in one or more VMs (regex matching).
+ vmdelaccess Deletes a user's VM access in one or more VMs (regex).
Requires VM_SET_ACCESS user capability and VM_SET_ACCESS VM access capability.
vmexportdir Exports one or more VMs' directory into one or more tar archives.
- Creates one archive per VM (regex matching).
+ Creates one archive per VM (regex).
Requires VM_READFS VM access capability or VM_READFS_ANY user capability.
- tpllist Lists available templates (regex matching).
+ tpllist Lists available templates (regex).
Requires TPL_LIST or TPL_LIST_ANY user capabilities.
tplcreate Creates a template, either from an existing VM or from a .qcow file.
Requires TPL_CREATE user capability.
- tpldel Deletes one or more templates (regex matching).
+ tpldel Deletes one or more templates (regex).
Requires TPL_DESTROY or TPL_DESTROY_ANY user capabilities.
```
diff --git a/src/client_cli/cmdTemplate/templateDel.go b/src/client_cli/cmdTemplate/templateDel.go
index e8d872d8a54065dd4cf80e4efe118d5c2fc5ddaf..f7872a6e958234a271b9ae463c9553c387a4ae81 100644
--- a/src/client_cli/cmdTemplate/templateDel.go
+++ b/src/client_cli/cmdTemplate/templateDel.go
@@ -15,7 +15,7 @@ func (cmd *Del)GetName() string {
func (cmd *Del)GetDesc() []string {
return []string{
- "Deletes one or more templates (regex matching).",
+ "Deletes one or more templates (regex).",
"Requires TPL_DESTROY or TPL_DESTROY_ANY user capabilities."}
}
diff --git a/src/client_cli/cmdTemplate/templateList.go b/src/client_cli/cmdTemplate/templateList.go
index d361fe25c114e26af70d0264d083f083bd784bce..d7cda402e212aaf622549dd151094e8ab54701bc 100644
--- a/src/client_cli/cmdTemplate/templateList.go
+++ b/src/client_cli/cmdTemplate/templateList.go
@@ -10,7 +10,7 @@ func (cmd *List)GetName() string {
func (cmd *List)GetDesc() []string {
return []string{
- "Lists available templates (regex matching).",
+ "Lists available templates (regex).",
"Requires TPL_LIST or TPL_LIST_ANY user capabilities."}
}
diff --git a/src/client_cli/cmdUser/userList.go b/src/client_cli/cmdUser/userList.go
index c00ab4ead320a451848d502036d998ac2e84a69e..3387b3570504ec328b3b46c792ea3715ecda5931 100644
--- a/src/client_cli/cmdUser/userList.go
+++ b/src/client_cli/cmdUser/userList.go
@@ -10,7 +10,7 @@ func (cmd *List)GetName() string {
func (cmd *List)GetDesc() []string {
return []string{
- "Lists users (regex matching).",
+ "Lists users (regex).",
"Requires USER_LIST user capability."}
}
diff --git a/src/client_cli/cmdVM/vmAttach.go b/src/client_cli/cmdVM/vmAttach.go
index b67bba79ed99221423a1f7b4c899a56d08ebba19..bb94fe7e5a67287a1f7207fe952e76e82d6bcca5 100644
--- a/src/client_cli/cmdVM/vmAttach.go
+++ b/src/client_cli/cmdVM/vmAttach.go
@@ -24,7 +24,7 @@ func (cmd *Attach)GetName() string {
func (cmd *Attach)GetDesc() []string {
return []string{
- "Attaches to one or more VMs in order to use their desktop environment (regex matching).",
+ "Attaches to one or more VMs in order to use their desktop environment (regex).",
"Requires VM_LIST VM access capability or VM_LIST_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmCreate.go b/src/client_cli/cmdVM/vmCreate.go
index 984f2a4c262eb336bb92ee5dbf14227b3cab0fcd..e2f446e45da75d71fc77885b51c57ad6e411ca94 100644
--- a/src/client_cli/cmdVM/vmCreate.go
+++ b/src/client_cli/cmdVM/vmCreate.go
@@ -19,7 +19,7 @@ func (cmd *Create)GetName() string {
func (cmd *Create)GetDesc() []string {
return []string{
- "Creates one or more VMs (regex matching).",
+ "Creates one or more VMs (regex).",
"Requires VM_CREATE user capability."}
}
diff --git a/src/client_cli/cmdVM/vmCred2pdf.go b/src/client_cli/cmdVM/vmCred2pdf.go
index 1c3f7bd72b22ce994fbce31ed08f9f17269e1338..a2f53cd69e99351ab408c3f37221a274ab45118f 100644
--- a/src/client_cli/cmdVM/vmCred2pdf.go
+++ b/src/client_cli/cmdVM/vmCred2pdf.go
@@ -16,7 +16,7 @@ func (cmd *Cred2pdf)GetName() string {
func (cmd *Cred2pdf)GetDesc() []string {
return []string{
- "Creates a PDF with the credentials required to attach to running VMs (regex matching).",
+ "Creates a PDF with the credentials required to attach to running VMs (regex).",
"Requires VM_LIST VM access capability or VM_LIST_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmDel.go b/src/client_cli/cmdVM/vmDel.go
index a5cf919a5e50ae6aabd1ab484eaf05fb98c99594..5e26cd48682851668fd5ed9ff5eebe7e9e175e06 100644
--- a/src/client_cli/cmdVM/vmDel.go
+++ b/src/client_cli/cmdVM/vmDel.go
@@ -15,7 +15,7 @@ func (cmd *Del)GetName() string {
func (cmd *Del)GetDesc() []string {
return []string{
- "Deletes one or more VMs (regex matching).",
+ "Deletes one or more VMs (regex).",
"Requires VM_DESTROY VM access capability or VM_DESTROY_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmDelAccess.go b/src/client_cli/cmdVM/vmDelAccess.go
index f57a0896708689e13d5add6b635d1aadb887505b..ab5e89fc70dc68f76f40a152b519561836f2aba1 100644
--- a/src/client_cli/cmdVM/vmDelAccess.go
+++ b/src/client_cli/cmdVM/vmDelAccess.go
@@ -21,7 +21,7 @@ func (cmd *DelAccess)GetName() string {
func (cmd *DelAccess)GetDesc() []string {
return []string{
- "Deletes a user's VM access in one or more VMs (regex matching).",
+ "Deletes a user's VM access in one or more VMs (regex).",
"Requires VM_SET_ACCESS user capability and VM_SET_ACCESS VM access capability."}
}
diff --git a/src/client_cli/cmdVM/vmEdit.go b/src/client_cli/cmdVM/vmEdit.go
index 02f1290df0e5d3cf7ad0640472bfccfc87566822..c78b299169783f38bcac4a37fe64547fc4f45aef 100644
--- a/src/client_cli/cmdVM/vmEdit.go
+++ b/src/client_cli/cmdVM/vmEdit.go
@@ -25,7 +25,7 @@ func (cmd *Edit)GetName() string {
func (cmd *Edit)GetDesc() []string {
return []string{
- "Edits one or more VMs' properties: name, cpus, ram or nic (regex matching).",
+ "Edits one or more VMs' properties: name, cpus, ram or nic (regex).",
"Requires VM_EDIT VM access capability or VM_EDIT_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmExportDir.go b/src/client_cli/cmdVM/vmExportDir.go
index 9d9af86359bf0da689fee0b1a7f44a40bac97f94..8c27f6254ecfd4b6113aa9d4a3bd3582cd5c2c41 100644
--- a/src/client_cli/cmdVM/vmExportDir.go
+++ b/src/client_cli/cmdVM/vmExportDir.go
@@ -20,7 +20,7 @@ func (cmd *ExportDir)GetName() string {
func (cmd *ExportDir)GetDesc() []string {
return []string{
"Exports one or more VMs' directory into one or more tar archives.",
- "Creates one archive per VM (regex matching).",
+ "Creates one archive per VM (regex).",
"Requires VM_READFS VM access capability or VM_READFS_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmList.go b/src/client_cli/cmdVM/vmList.go
index 83a3a4a01f3045e43b8725fd9521b50a8cab87a1..f418f8add1e948eb182e00273107d8939667aae5 100644
--- a/src/client_cli/cmdVM/vmList.go
+++ b/src/client_cli/cmdVM/vmList.go
@@ -14,7 +14,7 @@ func (cmd *List)GetName() string {
func (cmd *List)GetDesc() []string {
return []string{
- "Lists VMs that can be listed (regex matching).",
+ "Lists VMs that can be listed (regex).",
"Requires VM_LIST VM access capability or VM_LIST_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmListAttach.go b/src/client_cli/cmdVM/vmListAttach.go
index 77b73225c549d45307833f17f013a61ee84f0525..1776703718247bd6f07175879a40a238c6d3b8ef 100644
--- a/src/client_cli/cmdVM/vmListAttach.go
+++ b/src/client_cli/cmdVM/vmListAttach.go
@@ -10,7 +10,7 @@ func (cmd *ListAttach)GetName() string {
func (cmd *ListAttach)GetDesc() []string {
return []string{
- "Lists VMs that can be attached to (regex matching).",
+ "Lists VMs that can be attached to (regex).",
"Requires VM_LIST VM access capability or VM_LIST_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmListDel.go b/src/client_cli/cmdVM/vmListDel.go
index 0da557d5be6fad231738c6a688fa3d012f21a26f..25780dd67882f12cf1a372acf6e272106c3333ac 100644
--- a/src/client_cli/cmdVM/vmListDel.go
+++ b/src/client_cli/cmdVM/vmListDel.go
@@ -10,7 +10,7 @@ func (cmd *ListDel)GetName() string {
func (cmd *ListDel)GetDesc() []string {
return []string{
- "Lists VMs that can be deleted (regex matching).",
+ "Lists VMs that can be deleted (regex).",
"Requires VM_DESTROY VM access capability or VM_DESTROY_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmListEdit.go b/src/client_cli/cmdVM/vmListEdit.go
index 4c3c20728b4439d5d9cc0a65acb7ea2ee78c2482..0fccceda1aa5f70a3aea4901a96d728c9646c738 100644
--- a/src/client_cli/cmdVM/vmListEdit.go
+++ b/src/client_cli/cmdVM/vmListEdit.go
@@ -10,7 +10,7 @@ func (cmd *ListEdit)GetName() string {
func (cmd *ListEdit)GetDesc() []string {
return []string{
- "Lists VMs that can be edited (regex matching).",
+ "Lists VMs that can be edited (regex).",
"Requires VM_EDIT VM access capability or VM_EDIT_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmListEditAccess.go b/src/client_cli/cmdVM/vmListEditAccess.go
index 47bf73cd48414a0dd721d54f04574f851f5a746e..e2bdd6c76358218a3d4526455b56cdd30d133da6 100644
--- a/src/client_cli/cmdVM/vmListEditAccess.go
+++ b/src/client_cli/cmdVM/vmListEditAccess.go
@@ -10,7 +10,7 @@ func (cmd *ListEditAccess)GetName() string {
func (cmd *ListEditAccess)GetDesc() []string {
return []string{
- "Lists VMs that can have their VM access edited (regex matching).",
+ "Lists VMs that can have their VM access edited (regex).",
"Requires VM_SET_ACCESS user capability and VM_SET_ACCESS VM access capability."}
}
diff --git a/src/client_cli/cmdVM/vmListExportDir.go b/src/client_cli/cmdVM/vmListExportDir.go
index abe2593231171e3547fcf4f67b32cbb3baa9e08f..b67c2c63c2c169703251087f52fae2507140c3da 100644
--- a/src/client_cli/cmdVM/vmListExportDir.go
+++ b/src/client_cli/cmdVM/vmListExportDir.go
@@ -10,7 +10,7 @@ func (cmd *ListExportDir)GetName() string {
func (cmd *ListExportDir)GetDesc() []string {
return []string{
- "List VMs that can have a directory exported (regex matching).",
+ "List VMs that can have a directory exported (regex).",
"Requires VM_READFS VM access capability or VM_READFS_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmListStart.go b/src/client_cli/cmdVM/vmListStart.go
index 85ba5d6de77b198dbba0e78f2e80c26504b7ced1..2b4e8e5a2fee3f8bd3729f2e811634055e609a00 100644
--- a/src/client_cli/cmdVM/vmListStart.go
+++ b/src/client_cli/cmdVM/vmListStart.go
@@ -10,7 +10,7 @@ func (cmd *ListStart)GetName() string {
func (cmd *ListStart)GetDesc() []string {
return []string{
- "Lists VMs that can be started (regex matching).",
+ "Lists VMs that can be started (regex).",
"Requires VM_START VM access capability or VM_START_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmListStop.go b/src/client_cli/cmdVM/vmListStop.go
index 76da9b65af8713c5964336a5a375665dcc522093..7dd9e11f4468c751eb62b3b3fd834c62f4c99ecf 100644
--- a/src/client_cli/cmdVM/vmListStop.go
+++ b/src/client_cli/cmdVM/vmListStop.go
@@ -10,7 +10,7 @@ func (cmd *ListStop)GetName() string {
func (cmd *ListStop)GetDesc() []string {
return []string{
- "Lists VMs that can be stopped or shutdown (regex matching).",
+ "Lists VMs that can be stopped or shutdown (regex).",
"Requires VM_STOP VM access capability or VM_STOP_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmSetAccess.go b/src/client_cli/cmdVM/vmSetAccess.go
index f6c1c801cdd43f579739272aa9a7c4705459981b..d098f930ce5a540db6c07dee72e8c4fc567a5e63 100644
--- a/src/client_cli/cmdVM/vmSetAccess.go
+++ b/src/client_cli/cmdVM/vmSetAccess.go
@@ -17,7 +17,7 @@ func (cmd *SetAccess)GetName() string {
func (cmd *SetAccess)GetDesc() []string {
return []string{
- "Sets a user's VM access in one or more VMs (regex matching).",
+ "Sets a user's VM access in one or more VMs (regex).",
"Requires VM_SET_ACCESS user capability and VM_SET_ACCESS VM access capability."}
}
diff --git a/src/client_cli/cmdVM/vmShutdown.go b/src/client_cli/cmdVM/vmShutdown.go
index a091036fa45e72d04f7ed1e7850b88fc2cc7c36e..b6467387e5ed69f4fcec4e95e2366daaa5af2d44 100644
--- a/src/client_cli/cmdVM/vmShutdown.go
+++ b/src/client_cli/cmdVM/vmShutdown.go
@@ -15,7 +15,7 @@ func (cmd *Shutdown)GetName() string {
func (cmd *Shutdown)GetDesc() []string {
return []string{
- "Gracefully shutdowns one or more VMs (regex matching).",
+ "Gracefully shutdowns one or more VMs (regex).",
"Requires VM_STOP VM access capability or VM_STOP_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmStart.go b/src/client_cli/cmdVM/vmStart.go
index 1fa62e52c805dcd6c392c1a70a5e0c1c2c328b4d..7c9262bd7fee8e37848085e8892bfdd8a7fe1b46 100644
--- a/src/client_cli/cmdVM/vmStart.go
+++ b/src/client_cli/cmdVM/vmStart.go
@@ -15,7 +15,7 @@ func (cmd *Start)GetName() string {
func (cmd *Start)GetDesc() []string {
return []string{
- "Starts one or more VMs (regex matching).",
+ "Starts one or more VMs (regex).",
"Requires VM_START VM access capability or VM_START_ANY user capability."}
}
diff --git a/src/client_cli/cmdVM/vmStop.go b/src/client_cli/cmdVM/vmStop.go
index edc3a8edf3848daff70583c2152f19e3baf2e211..be2c90257905e433820f2c3a5dc43707b4f4958d 100644
--- a/src/client_cli/cmdVM/vmStop.go
+++ b/src/client_cli/cmdVM/vmStop.go
@@ -15,7 +15,7 @@ func (cmd *Stop)GetName() string {
func (cmd *Stop)GetDesc() []string {
return []string{
- "Stops by force one or more VMs (regex matching).",
+ "Stops by force one or more VMs (regex).",
"Requires VM_STOP VM access capability or VM_STOP_ANY user capability."}
}