fixed interactive prompt issue on CI

Signed-off-by: Mohamad Abuelhagag <mohammed.abuelhagag@gmail.com>

Author: dahagag

mkwvconf/mkwvconf.py

@@ -286,6 +286,9 @@ def cli():
     parser.add_argument('--xmlPath', type=FileType('r'))
     parser.add_argument('--modemDevice', type=str)
     parser.add_argument('--profileName', type=str)
+    parser.add_argument('--countryCode', type=str, help='Country code (non-interactive mode)')
+    parser.add_argument('--provider', type=str, help='Provider name (non-interactive mode)')
+    parser.add_argument('--apn', type=str, help='APN name (non-interactive mode)')
     args = parser.parse_args()
 
     opts = {}
@@ -302,11 +305,19 @@ def cli():
 
     mkwvconf = Mkwvconf(opts)
 
-    mkwvconf.displayIntro()
-    countryCode = mkwvconf.selectCountryCode()
-    provider = mkwvconf.selectProvider(countryCode)
-    apnname = mkwvconf.selectApn(countryCode, provider)
-    mkwvconf.makeConfig(countryCode, provider, apnname)
+    # Non-interactive mode: all parameters provided via command-line
+    if args.countryCode and args.provider and args.apn:
+        countryCode = args.countryCode
+        provider = args.provider
+        apnname = args.apn
+        mkwvconf.makeConfig(countryCode, provider, apnname)
+    else:
+        # Interactive mode
+        mkwvconf.displayIntro()
+        countryCode = mkwvconf.selectCountryCode()
+        provider = mkwvconf.selectProvider(countryCode)
+        apnname = mkwvconf.selectApn(countryCode, provider)
+        mkwvconf.makeConfig(countryCode, provider, apnname)
 
 
 if __name__ == "__main__":

test.sh

@@ -13,14 +13,14 @@ Running test with simple configuration
 "
 
 countryCode="za"
-provider="1"
+provider="Cell-c"
+apn="internet"
 modemLocation="/dev/ttyUSB1"
 profileName="testProfile"
 configPath="${configDir}/simpleConfiguration-actual.ini"
 expectedConfig="${configDir}/simpleConfiguration-expected.ini"
 
-echo -e "${countryCode}\n${provider}\nY\n${modemLocation}\nY\n${profileName}\nY\n" \
-| mkwvconf --configPath="${configPath}"
+mkwvconf --configPath="${configPath}" --countryCode="${countryCode}" --provider="${provider}" --apn="${apn}" --modemDevice="${modemLocation}" --profileName="${profileName}"
 
 cat > "${expectedConfig}" << EOF
 
@@ -46,15 +46,14 @@ Running test with custom apn
 "
 
 countryCode="ug"
-provider="1"
-apn="0"
+provider="MTN"
+apn="yellopix.mtn.co.ug"
 modemLocation="/dev/ttyUSB2"
 profileName="testProfile2"
 configPath="${configDir}/apnConfiguration-actual.ini"
 expectedConfig="${configDir}/apnConfiguration-expected.ini"
 
-echo -e "${countryCode}\n${provider}\nY\n${apn}\nY\n${modemLocation}\nY\n${profileName}\nY\n" \
-| mkwvconf --configPath="${configPath}"
+mkwvconf --configPath="${configPath}" --countryCode="${countryCode}" --provider="${provider}" --apn="${apn}" --modemDevice="${modemLocation}" --profileName="${profileName}"
 
 cat > "${expectedConfig}" << EOF
 
@@ -67,8 +66,8 @@ Username =
 Password = 
 Modem = /dev/ttyUSB2
 Init1 = ATZ
-Init2 = at+cgdcont=1,"ip","orange.ug"
+Init2 = at+cgdcont=1,"ip","yellopix.mtn.co.ug"
 Stupid Mode = 1
 EOF
 
-diff --side-by-side "${expectedConfig}" "${configPath}"
+