REMOVE ngsiv1Autocast

telefonicaid · Aug 6, 2024 · e8c5644 · e8c5644
1 parent 78e98b3
commit e8c5644
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 1,537 deletions.
diff --git a/doc/manuals.jp/admin/cli.md b/doc/manuals.jp/admin/cli.md
@@ -169,5 +169,4 @@ Orion は、環境変数を使用した引数の受け渡しをサポートし
 |   ORION_DISABLE_METRICS   |   disableMetrics  |
 |   ORION_DISABLE_NGSIV1    |   disableNgsiv1   |
 |   ORION_INSECURE_NOTIF    |   insecureNotif   |
-|   ORION_NGSIV1_AUTOCAST   |   ngsiv1Autocast  |
 |   ORION_MQTT_MAX_AGE      |  mqttMaxAge  |
diff --git a/doc/manuals/admin/cli.md b/doc/manuals/admin/cli.md
@@ -233,6 +233,5 @@ Two facts have to be taken into account:
 |	ORION_DISABLE_METRICS	|	disableMetrics	|
 |	ORION_DISABLE_NGSIV1	|	disableNgsiv1	|
 |	ORION_INSECURE_NOTIF	|	insecureNotif	|
-|	ORION_NGSIV1_AUTOCAST	|	ngsiv1Autocast	|
 |       ORION_MQTT_MAX_AGE      |  mqttMaxAge  |
 |       ORION_LOG_DEPRECATE |  logDeprecate |
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -157,7 +157,7 @@ RUN --mount=type=secret,id=repo_token,dst=/run/secrets/repo_token \
 WORKDIR /
 
 # Note we disable log file as docker container will output by stdout
-ENTRYPOINT ["/usr/bin/contextBroker","-fg", "-multiservice", "-ngsiv1Autocast", "-disableFileLog" ]
+ENTRYPOINT ["/usr/bin/contextBroker","-fg", "-multiservice", "-disableFileLog" ]
 EXPOSE 1026
 
 LABEL "maintainer"="Orion Team. Telefónica I+D"

diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
@@ -170,7 +170,7 @@ RUN --mount=type=secret,id=repo_token,dst=/run/secrets/repo_token \
 WORKDIR /
 
 # Note we disable log file as docker container will output by stdout
-ENTRYPOINT ["/usr/bin/contextBroker","-fg", "-multiservice", "-ngsiv1Autocast", "-disableFileLog" ]
+ENTRYPOINT ["/usr/bin/contextBroker","-fg", "-multiservice", "-disableFileLog" ]
 EXPOSE 1026
 
 LABEL "maintainer"="Orion Team. Telefónica I+D"

diff --git a/src/app/contextBroker/contextBroker.cpp b/src/app/contextBroker/contextBroker.cpp
@@ -190,7 +190,6 @@ bool            disableNgsiv1;
 bool            disableFileLog;
 int             reqTimeout;
 bool            insecureNotif;
-bool            ngsiv1Autocast;
 
 bool            fcEnabled;
 double          fcGauge;
@@ -348,8 +347,6 @@ PaArgument paArgs[] =
 
   { "-insecureNotif",               &insecureNotif,         "INSECURE_NOTIF",           PaBool,   PaOpt, false,                           false, true,                  INSECURE_NOTIF_DESC          },
 
-  { "-ngsiv1Autocast",              &ngsiv1Autocast,        "NGSIV1_AUTOCAST",          PaBool,   PaOpt, false,                           false, true,                  NGSIV1_AUTOCAST_DESC         },
-
   { "-mqttMaxAge",                  &mqttMaxAge,            "MQTT_MAX_AGE",             PaInt,    PaOpt, 60,                              PaNL,  PaNL,                  MQTT_MAX_AGE_DESC            },
 
   { "-logDeprecate",                &logDeprecate,          "LOG_DEPRECATE",            PaBool,   PaOpt, false,                           false, true,                  LOG_DEPRECATE_DESC           },

diff --git a/src/lib/common/globals.h b/src/lib/common/globals.h
@@ -207,7 +207,6 @@ extern bool               checkIdv1;
 extern bool               disableCusNotif;
 
 extern bool               insecureNotif;
-extern bool               ngsiv1Autocast;
 extern unsigned long long inReqPayloadMaxSize;
 extern unsigned long long outReqMsgMaxSize;
 

diff --git a/test/functionalTest/cases/0000_cli/bool_option_with_value.test b/test/functionalTest/cases/0000_cli/bool_option_with_value.test
@@ -93,7 +93,6 @@ Usage: contextBroker  [option '-U' (extended usage)]
                       [option '-disableMetrics' (turn off the 'metrics' feature)]
                       [option '-disableNgsiv1' (turn off NGSIv1 request endpoints)]
                       [option '-insecureNotif' (allow HTTPS notifications to peers which certificate cannot be authenticated with known CA certificates)]
-                      [option '-ngsiv1Autocast' (automatic cast for number, booleans and dates in NGSIv1 update/create attribute operations)]
                       [option '-mqttMaxAge' <max time (in minutes) that an unused MQTT connection is kept, default: 60>]
                       [option '-logDeprecate' (log deprecation usages as warnings)]
 

diff --git a/test/functionalTest/cases/0000_cli/command_line_options.test b/test/functionalTest/cases/0000_cli/command_line_options.test
@@ -82,7 +82,6 @@ Usage: contextBroker  [option '-U' (extended usage)]
                       [option '-disableMetrics' (turn off the 'metrics' feature)]
                       [option '-disableNgsiv1' (turn off NGSIv1 request endpoints)]
                       [option '-insecureNotif' (allow HTTPS notifications to peers which certificate cannot be authenticated with known CA certificates)]
-                      [option '-ngsiv1Autocast' (automatic cast for number, booleans and dates in NGSIv1 update/create attribute operations)]
                       [option '-mqttMaxAge' <max time (in minutes) that an unused MQTT connection is kept, default: 60>]
                       [option '-logDeprecate' (log deprecation usages as warnings)]
 

diff --git a/test/functionalTest/cases/0000_cli/tracelevel_without_logLevel_as_DEBUG.test b/test/functionalTest/cases/0000_cli/tracelevel_without_logLevel_as_DEBUG.test
@@ -83,7 +83,6 @@ Usage: contextBroker  [option '-U' (extended usage)]
                       [option '-disableMetrics' (turn off the 'metrics' feature)]
                       [option '-disableNgsiv1' (turn off NGSIv1 request endpoints)]
                       [option '-insecureNotif' (allow HTTPS notifications to peers which certificate cannot be authenticated with known CA certificates)]
-                      [option '-ngsiv1Autocast' (automatic cast for number, booleans and dates in NGSIv1 update/create attribute operations)]
                       [option '-mqttMaxAge' <max time (in minutes) that an unused MQTT connection is kept, default: 60>]
                       [option '-logDeprecate' (log deprecation usages as warnings)]