From f41169233bc08bb8b9303dbe016c34c67eb24ca5 Mon Sep 17 00:00:00 2001
From: Florent Gluck <florent.gluck@hesge.ch>
Date: Wed, 3 May 2023 00:25:28 +0200
Subject: [PATCH] - vmedit now shows the VM's uuid instead of its name as it's
confusing if the edit is actually used to update the VM's name - updated
validate script to use less memory
---
src/cmdVM/vmEdit.go | 3 ++-
src/nexus-cli/validate | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/cmdVM/vmEdit.go b/src/cmdVM/vmEdit.go
index 58d30cf..4d6248b 100644
--- a/src/cmdVM/vmEdit.go
+++ b/src/cmdVM/vmEdit.go
@@ -92,7 +92,8 @@ func (cmd *Edit)Run(args []string) int {
statusCode = 1
} else {
if resp.IsSuccess() {
- u.Println("Successfully edited VM \""+vm.Name+"\"")
+ u.Println("Successfully edited VM \""+vm.ID.String()+"\":")
+ u.Println(resp.String())
} else {
u.PrintlnErr("Failed editing VM \""+vm.Name+"\": "+resp.Status()+": "+resp.String())
statusCode = 1
diff --git a/src/nexus-cli/validate b/src/nexus-cli/validate
index a2467cc..76cce9c 100755
--- a/src/nexus-cli/validate
+++ b/src/nexus-cli/validate
@@ -66,7 +66,7 @@ checkVar $baseTemplateID "tpllist"
OK
echo "Create base VM..."
-vmID=`$nexus_cli vmcreate "$partial_name" 2 2000 user 1307:0165 $baseTemplateID | awk -F"|" '{print $2}'`
+vmID=`$nexus_cli vmcreate "$partial_name" 2 1500 user 067b:2303 $baseTemplateID | awk -F"|" '{print $2}'`
checkVar $vmID "vmcreate base VM"
OK
@@ -81,13 +81,14 @@ checkVar $templateID "tplcreate"
OK
echo "Create students VMs..."
-$nexus_cli vmcreate "$full_name" 1 2000 none none $templateID validation_data/students.csv
+$nexus_cli vmcreate "$full_name" 2 1500 none 1fc9:0132,03eb:6124 $templateID validation_data/students.csv
check "vmcreate VMs"
OK
echo "Start students VMs..."
$nexus_cli vmstart "$full_name"
check "vmstart VMs"
+sleep 3
OK
echo "Generate credentials pdf..."
--
GitLab