From fc8508e97a18cc8b30b8abcf8ea8850620a75a60 Mon Sep 17 00:00:00 2001
From: Daniel Caires <daniel.caires@encora.com>
Date: Tue, 5 Sep 2023 11:22:45 -0300
Subject: [PATCH] Remove username from Parser

Removal of the --username argument from Parser and
pass V_BOX_OPTIONS.username value in the install_vbox.py

Closes-Bug: 2028861

Change-Id: I68422f5b436ea1d1f75a9272fb0ee3811453e846
Signed-off-by: Daniel Caires <daniel.caires@encora.com>
---
 virtualbox/pybox/Parser.py       | 6 ------
 virtualbox/pybox/consts/env.py   | 2 ++
 virtualbox/pybox/install_vbox.py | 3 +++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/virtualbox/pybox/Parser.py b/virtualbox/pybox/Parser.py
index 06e10d1..f2ef25d 100644
--- a/virtualbox/pybox/Parser.py
+++ b/virtualbox/pybox/Parser.py
@@ -126,12 +126,6 @@ def parse_setup_config(parser: ArgumentParser):
                         """,
                         type=str, choices=['serial', 'graphical'],
                         default='serial')
-    parser.add_argument("--username", help=
-                        """
-                        Username. default is 'sysadmin'
-                        """,
-                        type=str,
-                        default="sysadmin")
     parser.add_argument("--password", help=
                         """
                         admin password
diff --git a/virtualbox/pybox/consts/env.py b/virtualbox/pybox/consts/env.py
index 0a63b7c..19afe30 100644
--- a/virtualbox/pybox/consts/env.py
+++ b/virtualbox/pybox/consts/env.py
@@ -15,6 +15,8 @@ import os
 
 user = getpass.getuser()
 
+USERNAME = "sysadmin"
+
 if platform in ("win32", "win64"):
     LOGPATH = "C:\\Temp\\pybox_logs"
 else:
diff --git a/virtualbox/pybox/install_vbox.py b/virtualbox/pybox/install_vbox.py
index 91fd376..a2e5687 100755
--- a/virtualbox/pybox/install_vbox.py
+++ b/virtualbox/pybox/install_vbox.py
@@ -32,6 +32,7 @@ from helper.install_lab import exec_cmd, fault_tolerant
 from consts.node import Nodes
 from consts.networking import NICs, OAM, MGMT, Serial
 from consts.timeout import HostTimeout
+from consts import env
 
 from Parser import handle_args
 
@@ -2184,6 +2185,8 @@ def load_config():
     global V_BOX_OPTIONS  # pylint: disable=global-statement
     V_BOX_OPTIONS = handle_args().parse_args()
 
+    V_BOX_OPTIONS.username = env.USERNAME
+
     if V_BOX_OPTIONS.sysadmin_password is None:
         V_BOX_OPTIONS.sysadmin_password = V_BOX_OPTIONS.password