update dockerfile

Author: Helene

Dockerfile

@@ -28,6 +28,16 @@ ARG HTTPPROTOCOL=http
 ENV PROTOCOL=$HTTPPROTOCOL
 RUN echo "the HTTP/S protocol is set to $PROTOCOL"
 
+ARG HTTPBASICAUTH=True
+ENV BASICAUTH=$HTTPBASICAUTH
+RUN echo "the HTTP/S basic authentication is set to $BASICAUTH"
+
+ARG AUTHUSER=None
+ENV BASICAUTHUSER=$AUTHUSER
+
+ARG AUTHPASSW=NotSet
+ENV BASICAUTHPASSW=$AUTHPASSW
+
 ARG HTTPPORT=None
 ENV PORT=$HTTPPORT
 RUN echo "the OpentTSDB API HTTP/S port is set to $PORT"
@@ -129,7 +139,7 @@ RUN chown -R $UID:$GID /opt/IBM/bridge && \
 # Switch user
 USER $GID
 
-CMD ["sh", "-c", "python3 zimonGrafanaIntf.py -c 10 -s $SERVER -r $PROTOCOL -p $PORT -e $PROMETHEUS -P $SERVERPORT -t $TLSKEYPATH -l $LOGPATH --tlsKeyFile $TLSKEYFILE --tlsCertFile $TLSCERTFILE --apiKeyName $APIKEYNAME --apiKeyValue $APIKEYVALUE"]
+CMD ["sh", "-c", "python3 zimonGrafanaIntf.py -c 10 -s $SERVER -r $PROTOCOL -b $BASICAUTH -u $BASICAUTHUSER -a BASICAUTHPASSW -p $PORT -e $PROMETHEUS -P $SERVERPORT -t $TLSKEYPATH -l $LOGPATH -k $TLSKEYFILE -m $TLSCERTFILE -n $APIKEYNAME -v $APIKEYVALUE"]
 
 EXPOSE 4242 8443 9250
 

source/confParser.py

@@ -234,6 +234,8 @@ def parse_cmd_args(argv):
                         help='port number listening on OpenTSDB API HTTP(S) connections (Default from config.ini: 4242, if enabled)')
     parser.add_argument('-r', '--protocol', action="store", choices=["http", "https"], default=None,
                         help='Connection protocol HTTP/HTTPS (Default from config.ini: "http")')
+    parser.add_argument('-b', '--enabled', action="store", choices=["True", "False"], default=None,
+                        help='Controls if HTTP/S basic authentication should be enabled or not (Default from config.ini: "True")')
     parser.add_argument('-u', '--username', action="store", default=None,
                         help='HTTP/S basic authentication user name(Default from config.ini: \'scale_admin\')')
     parser.add_argument('-a', '--password', action=Password, nargs='?', dest='password', default=None,

tests/test_parser.py

@@ -13,7 +13,7 @@ def test_case02():
 
 
 def test_case03():
-    result = os.system('python ./source/zimonGrafanaIntf.py -b')
+    result = os.system('python ./source/zimonGrafanaIntf.py -w')
     assert result > 0