Merge pull request #836 from SoftLayer/issues330

`vs ready` will now check for Transaction Status, not `isPingable`

Author: allmightyspiff

plugin/commands/virtual/create.go

@@ -3,7 +3,7 @@ package virtual
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
+
 	"io/ioutil"
 	"strconv"
 	"time"
@@ -363,7 +363,6 @@ func (cmd *CreateCommand) verifyParams() (map[string]interface{}, error) {
 
 	if cmd.Flavor != "" {
 		if cmd.CPU != 0 {
-			fmt.Printf("Returning an error....\n")
 			return nil, slErrors.NewExclusiveFlagsError("[-c|--cpu]", "[--flavor]")
 		}
 		if cmd.Memory != 0 {
@@ -488,12 +487,10 @@ func (cmd *CreateCommand) verifyParams() (map[string]interface{}, error) {
 	}
 
 	if len(cmd.PubSecGroup) > 0 {
-		fmt.Printf("PubSecGroup(%v): %v\n", cmd.Domain, cmd.PubSecGroup)
 		params["public-security-group"] = cmd.PubSecGroup
 	}
 
 	if len(cmd.PriSecGroup) > 0 {
-		fmt.Printf("PriSecGroup: %v\n", cmd.PriSecGroup)
 		params["private-security-group"] = cmd.PriSecGroup
 	}
 

plugin/commands/virtual/ready.go

@@ -27,11 +27,8 @@ func NewReadyCommand(sl *metadata.SoftlayerCommand) (cmd *ReadyCommand) {
 	cobraCmd := &cobra.Command{
 		Use:   "ready " + T("IDENTIFIER"),
 		Short: T("Check if a virtual server instance is ready for use"),
-		Long: T(`${COMMAND_NAME} sl vs ready IDENTIFIER [OPTIONS]
-	
-EXAMPLE:
-   ${COMMAND_NAME} sl vs ready 12345678 --wait 30
-   This command checks virtual server instance with ID 12345678 status to see if it is ready for use continuously and waits up to 30 seconds.`),
+		Long: T(`Will periodically check the status of a virtual server's active transaction.
+When the transcation is finished the virtual server should be ready for use.`),
 		Args: metadata.OneArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return thisCmd.Run(args)
@@ -52,7 +49,7 @@ func (cmd *ReadyCommand) Run(args []string) error {
 	ready, message, err := cmd.VirtualServerManager.InstanceIsReady(vsID, until)
 	subs := map[string]interface{}{"VsID": vsID, "VsId": vsID}
 	if err != nil {
-		return slErrors.NewAPIError(T("Failed to check virtual server instance {{.VsID}} is ready.\n", subs), err.Error(), 2)
+		return err
 	}
 	if ready {
 		cmd.UI.Print(T("Virtual server instance: {{.VsId}} is ready.", subs))

plugin/commands/virtual/ready_test.go

@@ -54,7 +54,6 @@ var _ = Describe("VS ready", func() {
 			It("return error", func() {
 				err := testhelpers.RunCobraCommand(cliCommand.Command, "1234")
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring("Failed to check virtual server instance 1234 is ready."))
 				Expect(err.Error()).To(ContainSubstring("Internal Server Error"))
 			})
 		})

plugin/i18n/resources/de_DE.all.json

@@ -451,10 +451,6 @@
     "id": "${COMMAND_NAME} sl vs migrate [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs migrate --guest 1234567\n   Manage VSIs that require migration. Can migrate Dedicated Instance from one dedicated host to another dedicated host as well.",
     "translation": "${COMMAND_NAME} sl vs migrate [OPTIONEN]\n \nBEISPIEL:\n ${COMMAND_NAME} sl vs migrate --guest 1234567\n VSIs verwalten, die eine Migration erfordern. Kann auch eine dedizierte Instanz von einem dedizierten Host auf einen anderen dedizierten Host migrieren."
   },
-  {
-    "id": "${COMMAND_NAME} sl vs ready IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs ready 12345678 --wait 30\n   This command checks virtual server instance with ID 12345678 status to see if it is ready for use continuously and waits up to 30 seconds.",
-    "translation": "${COMMAND_NAME} sl vs ready IDENTIFIER [OPTIONEN]\n\t\nBEISPIEL:\n   ${COMMAND_NAME} sl vs ready 12345678 --wait 30\n   Dieser Befehl prüft den Status der virtuellen Serverinstanz mit der ID 12345678 darauf hin, ob sie durchgehend betriebsbereit ist, und wartet bis zu 30 Sekunden."
-  },
   {
     "id": "${COMMAND_NAME} sl vs reload IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl vs reload 12345678\n   This command reloads current operating system for virtual server instance with ID 12345678.\n   ${COMMAND_NAME} sl vs reload 12345678 --image 1234\n   This command reloads operating system from image with ID 1234 for virtual server instance with ID 12345678.",
     "translation": "${COMMAND_NAME} sl vs reload IDENTIFIER [OPTIONEN]\n\nBEISPIEL:\n   ${COMMAND_NAME} sl vs reload 12345678\n   Dieser Befehl lädt das aktuelle Betriebssystem für die virtuelle Serverinstanz mit der ID 12345678 neu.\n   ${COMMAND_NAME} sl vs reload 12345678 --image 1234\n   Dieser Befehl lädt das Betriebssystem aus dem Image mit der ID 1234 für die virtuelle Serverinstanz mit der ID 12345678 neu."
@@ -3031,10 +3027,6 @@
     "id": "Failed to capture image for virtual server instance: {{.VsID}}.\n",
     "translation": "Erfassen eines Images für die virtuelle Serverinstanz {{.VsID}} fehlgeschlagen.\n"
   },
-  {
-    "id": "Failed to check virtual server instance {{.VsID}} is ready.\n",
-    "translation": "Prüfen der Bereitschaft der virtuellen Serverinstanz {{.VsID}} fehlgeschlagen.\n"
-  },
   {
     "id": "Failed to confirm the new LUN ID on volume {{.VolumeId}}.",
     "translation": "Bestätigen der neuen LUN-ID für Datenträger {{.VolumeId}} fehlschlagen."
@@ -3779,10 +3771,6 @@
     "id": "Failed to get the vlans available for datacener: {{.DATACENTER}} and flavor: {{.FLAVOR}}.",
     "translation": "Die für Rechenzentrum {{.DATACENTER}} und Version {{.FLAVOR}} verfügbaren VLANs konnten nicht abgerufen werden."
   },
-  {
-    "id": "Failed to get this virtual guest instance.",
-    "translation": "Abrufen dieser virtuellen Gastinstanz fehlgeschlagen."
-  },
   {
     "id": "Failed to get translation with ID {{.TransID}} from IPSec {{.ID}}.",
     "translation": "Abrufen der Umsetzung mit ID {{.TransID}} von IPSec {{.ID}} fehlgeschlagen."
@@ -4075,10 +4063,6 @@
     "id": "Failed to purge.",
     "translation": "Löschen fehlgeschlagen."
   },
-  {
-    "id": "Failed to reach virtual guest instance {{.Id}}.",
-    "translation": "Erreichen der virtuellen Gastinstanz {{.Id}} fehlgeschlagen."
-  },
   {
     "id": "Failed to read SSH key from file: {{.File}}.\n",
     "translation": "Lesen des SSH-Schlüssels aus der Datei {{.File}} fehlgeschlagen.\n"
@@ -9495,22 +9479,6 @@
     "id": "Virtual guest domain name not found.",
     "translation": "Domänenname des virtuellen Gastsystems nicht gefunden."
   },
-  {
-    "id": "Virtual guest instance {{.Id}} is loading operating system.",
-    "translation": "Die virtuelle Gastinstanz {{.Id}} lädt das Betriebssystem."
-  },
-  {
-    "id": "Virtual guest instance {{.Id}} is not reachable.",
-    "translation": "Die virtuelle Gastinstanz {{.Id}} ist nicht erreichbar."
-  },
-  {
-    "id": "Virtual guest instance {{.Id}} is paused.",
-    "translation": "Die virtuelle Gastinstanz {{.Id}} wurde angehalten."
-  },
-  {
-    "id": "Virtual guest instance {{.Id}} is power off.",
-    "translation": "Die virtuelle Gastinstanz {{.Id}} wurde ausgeschaltet."
-  },
   {
     "id": "Virtual server ID should be a number.",
     "translation": "Die ID des virtuellen Servers muss eine Zahl sein."

plugin/i18n/resources/en_US.all.json

@@ -451,10 +451,6 @@
     "id": "${COMMAND_NAME} sl vs migrate [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs migrate --guest 1234567\n   Manage VSIs that require migration. Can migrate Dedicated Instance from one dedicated host to another dedicated host as well.",
     "translation": "${COMMAND_NAME} sl vs migrate [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs migrate --guest 1234567\n   Manage VSIs that require migration. Can migrate Dedicated Instance from one dedicated host to another dedicated host as well."
   },
-  {
-    "id": "${COMMAND_NAME} sl vs ready IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs ready 12345678 --wait 30\n   This command checks virtual server instance with ID 12345678 status to see if it is ready for use continuously and waits up to 30 seconds.",
-    "translation": "${COMMAND_NAME} sl vs ready IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs ready 12345678 --wait 30\n   This command checks virtual server instance with ID 12345678 status to see if it is ready for use continuously and waits up to 30 seconds."
-  },
   {
     "id": "${COMMAND_NAME} sl vs reload IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl vs reload 12345678\n   This command reloads current operating system for virtual server instance with ID 12345678.\n   ${COMMAND_NAME} sl vs reload 12345678 --image 1234\n   This command reloads operating system from image with ID 1234 for virtual server instance with ID 12345678.",
     "translation": "${COMMAND_NAME} sl vs reload IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl vs reload 12345678\n   This command reloads current operating system for virtual server instance with ID 12345678.\n   ${COMMAND_NAME} sl vs reload 12345678 --image 1234\n   This command reloads operating system from image with ID 1234 for virtual server instance with ID 12345678."
@@ -3031,10 +3027,6 @@
     "id": "Failed to capture image for virtual server instance: {{.VsID}}.\n",
     "translation": "Failed to capture image for virtual server instance: {{.VsID}}.\n"
   },
-  {
-    "id": "Failed to check virtual server instance {{.VsID}} is ready.\n",
-    "translation": "Failed to check virtual server instance {{.VsID}} is ready.\n"
-  },
   {
     "id": "Failed to confirm the new LUN ID on volume {{.VolumeId}}.",
     "translation": "Failed to confirm the new LUN ID on volume {{.VolumeId}}."
@@ -3779,10 +3771,6 @@
     "id": "Failed to get the vlans available for datacener: {{.DATACENTER}} and flavor: {{.FLAVOR}}.",
     "translation": "Failed to get the vlans available for datacener: {{.DATACENTER}} and flavor: {{.FLAVOR}}."
   },
-  {
-    "id": "Failed to get this virtual guest instance.",
-    "translation": "Failed to get this virtual guest instance."
-  },
   {
     "id": "Failed to get translation with ID {{.TransID}} from IPSec {{.ID}}.",
     "translation": "Failed to get translation with ID {{.TransID}} from IPSec {{.ID}}."
@@ -4075,10 +4063,6 @@
     "id": "Failed to purge.",
     "translation": "Failed to purge."
   },
-  {
-    "id": "Failed to reach virtual guest instance {{.Id}}.",
-    "translation": "Failed to reach virtual guest instance {{.Id}}."
-  },
   {
     "id": "Failed to read SSH key from file: {{.File}}.\n",
     "translation": "Failed to read SSH key from file: {{.File}}.\n"
@@ -9519,22 +9503,6 @@
     "id": "Virtual guest domain name not found.",
     "translation": "Virtual guest domain name not found."
   },
-  {
-    "id": "Virtual guest instance {{.Id}} is loading operating system.",
-    "translation": "Virtual guest instance {{.Id}} is loading operating system."
-  },
-  {
-    "id": "Virtual guest instance {{.Id}} is not reachable.",
-    "translation": "Virtual guest instance {{.Id}} is not reachable."
-  },
-  {
-    "id": "Virtual guest instance {{.Id}} is paused.",
-    "translation": "Virtual guest instance {{.Id}} is paused."
-  },
-  {
-    "id": "Virtual guest instance {{.Id}} is power off.",
-    "translation": "Virtual guest instance {{.Id}} is power off."
-  },
   {
     "id": "Virtual server ID should be a number.",
     "translation": "Virtual server ID should be a number."
@@ -9627,6 +9595,10 @@
     "id": "Whether or not this duplicate will be a dependent duplicate of the origin volume.",
     "translation": "Whether or not this duplicate will be a dependent duplicate of the origin volume."
   },
+  {
+    "id": "Will periodically check the status of a virtual server's active transaction.\nWhen the transcation is finished the virtual server should be ready for use.",
+    "translation": "Will periodically check the status of a virtual server's active transaction.\nWhen the transcation is finished the virtual server should be ready for use."
+  },
   {
     "id": "Would you like to submit the rules. Continue?",
     "translation": "Would you like to submit the rules. Continue?"

plugin/i18n/resources/es_ES.all.json

@@ -451,10 +451,6 @@
     "id": "${COMMAND_NAME} sl vs migrate [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs migrate --guest 1234567\n   Manage VSIs that require migration. Can migrate Dedicated Instance from one dedicated host to another dedicated host as well.",
     "translation": "${COMMAND_NAME} sl vs migrate [OPTIONS]\n\nEJEMPLO:\n   ${COMMAND_NAME} sl vs migrate --guest 1234567\n   Gestionar las VSI que requieran migración. Puede migrar la Instancia dedicada de un host dedicado a otro host dedicado también."
   },
-  {
-    "id": "${COMMAND_NAME} sl vs ready IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs ready 12345678 --wait 30\n   This command checks virtual server instance with ID 12345678 status to see if it is ready for use continuously and waits up to 30 seconds.",
-    "translation": "${COMMAND_NAME} sl vs ready IDENTIFIER [OPTIONS]\n\t\nEJEMPLO:\n   ${COMMAND_NAME} sl vs ready 12345678 --wait 30\n   Este mandato comprueba la instancia de servidor virtual con el estado del ID 12345678 para ver si está lista para su uso continuado y espera hasta 30 segundos."
-  },
   {
     "id": "${COMMAND_NAME} sl vs reload IDENTIFIER [OPTIONS]\n\nEXAMPLE:\n   ${COMMAND_NAME} sl vs reload 12345678\n   This command reloads current operating system for virtual server instance with ID 12345678.\n   ${COMMAND_NAME} sl vs reload 12345678 --image 1234\n   This command reloads operating system from image with ID 1234 for virtual server instance with ID 12345678.",
     "translation": "${COMMAND_NAME} sl vs reload IDENTIFIER [OPTIONS]\n\nEJEMPLO:\n   ${COMMAND_NAME} sl vs reload 12345678\n   Este mandato vuelve a cargar el sistema operativo actual para la instancia de servidor virtual con el ID 12345678.\n   ${COMMAND_NAME} sl vs reload 12345678 --image 1234\n   Este mandato vuelve a cargar el sistema operativo a partir de la imagen con el ID 1234 para la instancia de servidor virtual con el ID 12345678."
@@ -3031,10 +3027,6 @@
     "id": "Failed to capture image for virtual server instance: {{.VsID}}.\n",
     "translation": "No se ha podido capturar la imagen para la instancia de servidor virtual: {{.VsID}}.\n"
   },
-  {
-    "id": "Failed to check virtual server instance {{.VsID}} is ready.\n",
-    "translation": "No se ha podido comprobar si la instancia de servidor virtual {{.VsID}} está preparada.\n"
-  },
   {
     "id": "Failed to confirm the new LUN ID on volume {{.VolumeId}}.",
     "translation": "No se ha podido confirmar el nuevo ID de LUN en el volumen {{.VolumeId}}."
@@ -3779,10 +3771,6 @@
     "id": "Failed to get the vlans available for datacener: {{.DATACENTER}} and flavor: {{.FLAVOR}}.",
     "translation": "No se han podido obtener las vlans disponibles para el centro de datos: {{.DATACENTER}} y el tipo: {{.FLAVOR}}."
   },
-  {
-    "id": "Failed to get this virtual guest instance.",
-    "translation": "No se ha podido obtener esta instancia de invitado virtual."
-  },
   {
     "id": "Failed to get translation with ID {{.TransID}} from IPSec {{.ID}}.",
     "translation": "No se ha podido obtener conversión con ID {{.TransID}} de la IPSec {{.ID}}."
@@ -4075,10 +4063,6 @@
     "id": "Failed to purge.",
     "translation": "No se ha podido depurar."
   },
-  {
-    "id": "Failed to reach virtual guest instance {{.Id}}.",
-    "translation": "No se ha podido alcanzar la instancia de invitado virtual {{.Id}}."
-  },
   {
     "id": "Failed to read SSH key from file: {{.File}}.\n",
     "translation": "No se ha podido leer la clave SSH del archivo: {{.File}}.\n"
@@ -9495,22 +9479,6 @@
     "id": "Virtual guest domain name not found.",
     "translation": "No se ha encontrado el nombre de dominio de invitado virtual."
   },
-  {
-    "id": "Virtual guest instance {{.Id}} is loading operating system.",
-    "translation": "La instancia de invitado virtual {{.Id}} está cargando el sistema operativo."
-  },
-  {
-    "id": "Virtual guest instance {{.Id}} is not reachable.",
-    "translation": "La instancia de invitado virtual {{.Id}} es inalcanzable."
-  },
-  {
-    "id": "Virtual guest instance {{.Id}} is paused.",
-    "translation": "La instancia de invitado virtual {{.Id}} se ha detenido."
-  },
-  {
-    "id": "Virtual guest instance {{.Id}} is power off.",
-    "translation": "La instancia de invitado virtual {{.Id}} se ha apagado."
-  },
   {
     "id": "Virtual server ID should be a number.",
     "translation": "El ID de servidor virtual debe ser un número."