Merge pull request #891 from SoftLayer/issues852

Adds --local flag to `vs create` to force using a local disk instead of SAN

Author: allmightyspiff

.travis.yml

@@ -1,28 +1,30 @@
 group: bluezone
-language: go
-go:
-  - 1.21.3
-addons:
-  apt:
-    packages:
-      - python3 
-      - python3-pip 
-      - python3-setuptools
-install:
-  # Required to install detect-secrets
-  - echo -e "machine github.ibm.com\n  login $CI_USER_TOKEN" > ~/.netrc
-  - sudo python3 -m pip install -U pip
-  - sudo pip3 install pyOpenSSL --upgrade
-  - sudo pip3 install --upgrade "git+https://github.com/ibm/detect-secrets.git@master#egg=detect-secrets"
-  - curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin
-before_script:
-  - go vet $(go list ./... | grep -v "fixtures" | grep -v "vendor")
-  - go test $(go list ./... | grep -v "fixtures" | grep -v "vendor")
-  - detect-secrets scan --update .secrets.baseline
-  - detect-secrets audit .secrets.baseline --report --fail-on-unaudited --omit-instructions  
-  - gosec -exclude-dir=fixture -exclude-dir=plugin/resources -quiet ./...
-script:
-  - go build
+jobs:
+  include:
+    - language: python
+      python: 3.12
+      install:
+        - echo -e "machine github.ibm.com\n  login $CI_USER_TOKEN" > ~/.netrc
+        - python3 -m pip install -U pip
+        - pip3 install importlib_metadata
+        - pip3 install pyOpenSSL --upgrade
+        - pip3 install --upgrade "git+https://github.com/ibm/detect-secrets.git@master#egg=detect-secrets"
+      script:
+        - detect-secrets scan --update .secrets.baseline
+        - detect-secrets audit .secrets.baseline --report --fail-on-unaudited --omit-instructions  
+    - language: go
+      go: 1.21.3
+      install:
+        # Required to install detect-secrets
+        - echo -e "machine github.ibm.com\n  login $CI_USER_TOKEN" > ~/.netrc
+        - curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin
+      before_script:
+        - go vet $(go list ./... | grep -v "fixtures" | grep -v "vendor")
+        - go test $(go list ./... | grep -v "fixtures" | grep -v "vendor")
+        - gosec -exclude-dir=fixture -exclude-dir=plugin/resources -quiet ./...
+      script:
+        - go build
+
 notifications:
   slack:
     rooms: ibm-cloudplatform:RZfnTv0P664KhVAtEAjcEBPJ

plugin/commands/virtual/create.go

@@ -28,6 +28,7 @@ type CreateCommand struct {
 	Dedicated      bool
 	Private        bool
 	San            bool
+	Local          bool
 	Test           bool
 	Transient      bool
 	Force          bool
@@ -91,6 +92,7 @@ EXAMPLE:
 	cobraCmd.Flags().BoolVar(&thisCmd.Dedicated, "dedicated", false, T("Create a dedicated Virtual Server (Private Node)"))
 	cobraCmd.Flags().BoolVar(&thisCmd.Private, "private", false, T("Forces the virtual server to only have access the private network"))
 	cobraCmd.Flags().BoolVar(&thisCmd.San, "san", false, T("Use SAN storage instead of local disk"))
+	cobraCmd.Flags().BoolVar(&thisCmd.Local, "local", false, T("Use local disk storage."))
 	cobraCmd.Flags().BoolVar(&thisCmd.Test, "test", false, T("Do not actually create the virtual server"))
 	cobraCmd.Flags().BoolVar(&thisCmd.Transient, "transient", false, T("Create a transient virtual server"))
 	cobraCmd.Flags().BoolVarP(&thisCmd.Force, "force", "f", false, T("Force operation without confirmation"))
@@ -124,6 +126,7 @@ EXAMPLE:
 	cobraCmd.Flags().StringVarP(&thisCmd.Template, "template", "t", "", T("A template file that defaults the command-line options"))
 	cobraCmd.Flags().StringVarP(&thisCmd.Userdata, "userdata", "u", "", T("User defined metadata string"))
 	cobraCmd.Flags().StringVarP(&thisCmd.Userfile, "userfile", "F", "", T("Read userdata from file"))
+	cobraCmd.MarkFlagsMutuallyExclusive("san", "local")
 	return thisCmd
 }
 
@@ -446,6 +449,8 @@ func (cmd *CreateCommand) verifyParams() (map[string]interface{}, error) {
 
 	if cmd.San {
 		params["san"] = true
+	} else if cmd.Local {
+		params["san"] = false
 	}
 
 	if cmd.PostInstall != "" {

plugin/commands/virtual/create_test.go

@@ -320,8 +320,8 @@
   "${COMMAND_NAME} sl vs capture IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs capture 12345678 -n mycloud --all --note testing\n   This command captures virtual server instance with ID of 12345678 with all disks into an image named \"mycloud\" with note \"testing\".": {
     "other": "${COMMAND_NAME} sl vs capture IDENTIFIER [OPTIONEN]\n\t\nBEISPIEL:\n   ${COMMAND_NAME} sl vs capture 12345678 -n mycloud --all --note testing\n   Dieser Befehl erfasst die virtuelle Serverinstanz mit der ID 12345678 mit allen Platten in ein Image mit dem Namen \"mycloud\" und der Anmerkung \"testing\"."
   },
-  "${COMMAND_NAME} sl vs create [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413\n\tThis command orders a virtual server instance with hostname is myvsi, domain is ibm.com, 4 cpu cores, 4096M memory, located at datacenter: dal10,\n\toperation system is UBUNTU 16 64 bits, 2 disks, one is 100G, the other is 1000G, and placed at public vlan with ID 413.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --test\n\tThis command tests whether the order is valid with above options before the order is actually placed.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --export ~/myvsi.txt\n\tThis command exports above options to a file: myvsi.txt under user home directory for later use.": {
-    "other": "${COMMAND_NAME} sl vs create [OPTIONEN]\n\t\nBEISPIEL:\n   ${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413\n\tDieser Befehl fordert eine virtuelle Serverinstanz mit dem Hostnamen myvsi, der Domäne ibm.com, 4 CPU-Cores, 4096 M Speicher und Position im Rechenzentrum dal10 an,\n\tBetriebssystem ist UBUNTU 16 64-Bit, 2 Platten, die eine mit 100 G, die andere mit 1000 G und Position im öffentlichen VLAN mit der ID 413.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --test\n\tDieser Befehl testet, ob die Bestellung mit den obigen Optionen gültig ist, bevor die Anforderung tatsächlich aufgegeben wird.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --export ~/myvsi.txt\n\tDieser Befehl exportiert die obigen Optionen in die Datei myvsi.txt unter dem Benutzerausgangsverzeichnis für die spätere Verwendung."
+  "EXAMPLE:\n   ${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413\n\tThis command orders a virtual server instance with hostname is myvsi, domain is ibm.com, 4 cpu cores, 4096M memory, located at datacenter: dal10,\n\toperation system is UBUNTU 16 64 bits, 2 disks, one is 100G, the other is 1000G, and placed at public vlan with ID 413.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --test\n\tThis command tests whether the order is valid with above options before the order is actually placed.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --export ~/myvsi.txt\n\tThis command exports above options to a file: myvsi.txt under user home directory for later use.": {
+    "other": "BEISPIEL:\n   ${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413\n\tDieser Befehl fordert eine virtuelle Serverinstanz mit dem Hostnamen myvsi, der Domäne ibm.com, 4 CPU-Cores, 4096 M Speicher und Position im Rechenzentrum dal10 an,\n\tBetriebssystem ist UBUNTU 16 64-Bit, 2 Platten, die eine mit 100 G, die andere mit 1000 G und Position im öffentlichen VLAN mit der ID 413.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --test\n\tDieser Befehl testet, ob die Bestellung mit den obigen Optionen gültig ist, bevor die Anforderung tatsächlich aufgegeben wird.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --export ~/myvsi.txt\n\tDieser Befehl exportiert die obigen Optionen in die Datei myvsi.txt unter dem Benutzerausgangsverzeichnis für die spätere Verwendung."
   },
   "${COMMAND_NAME} sl vs dns-sync IDENTIFIER [OPTIONS]\n   Note: If you don't specify any arguments, it will attempt to update both the A\n   and PTR records. If you don't want to update both records, you may use the\n   -a or --ptr arguments to limit the records updated.\n \nEXAMPLE:\n   ${COMMAND_NAME} sl vs dns-sync 12345678 --a-record --ttl 3600\n   This command synchronizes A record(IP V4 address) of virtual server instance with ID 12345678 to DNS server and sets ttl of this A record to 3600.\n   ${COMMAND_NAME} sl vs dns-sync 12345678 --aaaa-record --ptr\n   This command synchronizes both AAAA record(IP V6 address) and PTR record of virtual server instance with ID 12345678 to DNS server.": {
     "other": "${COMMAND_NAME} sl vs dns-sync IDENTIFIER [OPTIONEN]\n   Hinweis: Wenn Sie keine Argumente angeben, wird versucht, sowohl die A-\n   als auch die PTR-Datensätze zu aktualisieren. Wenn nicht beide Datensätze aktualisiert werden sollen, können Sie die\n   Argumente -a oder --ptr verwenden, um die aktualisierten Datensätze einzugrenzen.\n \nBEISPIEL:\n   ${COMMAND_NAME} sl vs dns-sync 12345678 --a-record --ttl 3600\n   Dieser Befehl synchronisiert den A-Datensatz (IPv4-Adresse) der virtuellen Serverinstanz mit der ID 12345678 mit dem DNS-Server und legt das TTL dieses A-Datensatzes auf 3600 fest.\n   ${COMMAND_NAME} sl vs dns-sync 12345678 --aaaa-record --ptr\n   Dieser Befehl synchronisiert sowohl den AAAA-Datensatz (IPv6-Adresse) als auch den PTR-Datensatz der virtuellen Serverinstanz mit der ID 12345678 mit dem DNS-Server."

plugin/i18n/v2Resources/active.de_DE.json

@@ -326,8 +326,8 @@
   "${COMMAND_NAME} sl vs capture IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs capture 12345678 -n mycloud --all --note testing\n   This command captures virtual server instance with ID of 12345678 with all disks into an image named \"mycloud\" with note \"testing\".": {
     "other": "${COMMAND_NAME} sl vs capture IDENTIFIER [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs capture 12345678 -n mycloud --all --note testing\n   This command captures virtual server instance with ID of 12345678 with all disks into an image named \"mycloud\" with note \"testing\"."
   },
-  "${COMMAND_NAME} sl vs create [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413\n\tThis command orders a virtual server instance with hostname is myvsi, domain is ibm.com, 4 cpu cores, 4096M memory, located at datacenter: dal10,\n\toperation system is UBUNTU 16 64 bits, 2 disks, one is 100G, the other is 1000G, and placed at public vlan with ID 413.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --test\n\tThis command tests whether the order is valid with above options before the order is actually placed.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --export ~/myvsi.txt\n\tThis command exports above options to a file: myvsi.txt under user home directory for later use.": {
-    "other": "${COMMAND_NAME} sl vs create [OPTIONS]\n\t\nEXAMPLE:\n   ${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413\n\tThis command orders a virtual server instance with hostname is myvsi, domain is ibm.com, 4 cpu cores, 4096M memory, located at datacenter: dal10,\n\toperation system is UBUNTU 16 64 bits, 2 disks, one is 100G, the other is 1000G, and placed at public vlan with ID 413.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --test\n\tThis command tests whether the order is valid with above options before the order is actually placed.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --export ~/myvsi.txt\n\tThis command exports above options to a file: myvsi.txt under user home directory for later use."
+  "EXAMPLE:\n   ${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413\n\tThis command orders a virtual server instance with hostname is myvsi, domain is ibm.com, 4 cpu cores, 4096M memory, located at datacenter: dal10,\n\toperation system is UBUNTU 16 64 bits, 2 disks, one is 100G, the other is 1000G, and placed at public vlan with ID 413.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --test\n\tThis command tests whether the order is valid with above options before the order is actually placed.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --export ~/myvsi.txt\n\tThis command exports above options to a file: myvsi.txt under user home directory for later use.": {
+    "other": "EXAMPLE:\n   ${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413\n\tThis command orders a virtual server instance with hostname is myvsi, domain is ibm.com, 4 cpu cores, 4096M memory, located at datacenter: dal10,\n\toperation system is UBUNTU 16 64 bits, 2 disks, one is 100G, the other is 1000G, and placed at public vlan with ID 413.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --test\n\tThis command tests whether the order is valid with above options before the order is actually placed.\n\t${COMMAND_NAME} sl vs create -H myvsi -D ibm.com -c 4 -m 4096 -d dal10 -o UBUNTU_16_64 --disk 100 --disk 1000 --vlan-public 413 --export ~/myvsi.txt\n\tThis command exports above options to a file: myvsi.txt under user home directory for later use."
   },
   "${COMMAND_NAME} sl vs dns-sync IDENTIFIER [OPTIONS]\n   Note: If you don't specify any arguments, it will attempt to update both the A\n   and PTR records. If you don't want to update both records, you may use the\n   -a or --ptr arguments to limit the records updated.\n \nEXAMPLE:\n   ${COMMAND_NAME} sl vs dns-sync 12345678 --a-record --ttl 3600\n   This command synchronizes A record(IP V4 address) of virtual server instance with ID 12345678 to DNS server and sets ttl of this A record to 3600.\n   ${COMMAND_NAME} sl vs dns-sync 12345678 --aaaa-record --ptr\n   This command synchronizes both AAAA record(IP V6 address) and PTR record of virtual server instance with ID 12345678 to DNS server.": {
     "other": "${COMMAND_NAME} sl vs dns-sync IDENTIFIER [OPTIONS]\n   Note: If you don't specify any arguments, it will attempt to update both the A\n   and PTR records. If you don't want to update both records, you may use the\n   -a or --ptr arguments to limit the records updated.\n \nEXAMPLE:\n   ${COMMAND_NAME} sl vs dns-sync 12345678 --a-record --ttl 3600\n   This command synchronizes A record(IP V4 address) of virtual server instance with ID 12345678 to DNS server and sets ttl of this A record to 3600.\n   ${COMMAND_NAME} sl vs dns-sync 12345678 --aaaa-record --ptr\n   This command synchronizes both AAAA record(IP V6 address) and PTR record of virtual server instance with ID 12345678 to DNS server."
@@ -7133,6 +7133,9 @@
   "Use `${COMMAND_NAME} sl order lookup <ID>` to find more details about a specific order.": {
     "other": "Use `${COMMAND_NAME} sl order lookup <ID>` to find more details about a specific order."
   },
+  "Use local disk storage.": {
+    "other": "Use local disk storage."
+  },
   "Use the configuration from an existing virtual server": {
     "other": "Use the configuration from an existing virtual server"
   },