refactor: Update conf duration to string values (#1505)

Andrii · ondrej-fabry · commit 7deb9f6b15d3 · 2019-10-10T11:48:58.000+02:00
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/docker/dev/etcd.conf b/docker/dev/etcd.conf
@@ -1,4 +1,4 @@
 insecure-transport: true
-dial-timeout: 1000000000
+dial-timeout: 1s
 endpoints:
  - "172.17.0.1:2379"
diff --git a/docker/prod/etcd.conf b/docker/prod/etcd.conf
@@ -1,4 +1,4 @@
 insecure-transport: true
-dial-timeout: 1000000000
+dial-timeout: 1s
 endpoints:
  - "172.17.0.1:2379"
diff --git a/examples/localclient_with_etcd/etcd.conf b/examples/localclient_with_etcd/etcd.conf
@@ -1,4 +1,4 @@
 insecure-transport: true
-dial-timeout: 1000000000
+dial-timeout: 1s
 endpoints:
  - "127.0.0.1:2379"
diff --git a/examples/tutorials/101_custom-vppagent/etcd.conf b/examples/tutorials/101_custom-vppagent/etcd.conf
@@ -1,4 +1,4 @@
 insecure-transport: true
-dial-timeout: 1000000000
+dial-timeout: 1s
 endpoints:
  - "172.17.0.1:2379"
diff --git a/k8s/dev-setup/etcd.conf b/k8s/dev-setup/etcd.conf
@@ -1,4 +1,4 @@
 insecure-transport: true
-dial-timeout: 1000000000
+dial-timeout: 1s
 endpoints:
  - "127.0.0.1:22379"
diff --git a/k8s/dev-setup/vnf-vpp.yaml b/k8s/dev-setup/vnf-vpp.yaml
@@ -22,7 +22,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/dev-setup/vswitch-vpp.yaml b/k8s/dev-setup/vswitch-vpp.yaml
@@ -21,7 +21,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/scenario1/vnf/vnf-agent-cfg.yaml b/k8s/perf-demo/scenario1/vnf/vnf-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/scenario1/vswitch/vswitch-agent-cfg.yaml b/k8s/perf-demo/scenario1/vswitch/vswitch-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/scenario2/vnf/vnf-agent-cfg.yaml b/k8s/perf-demo/scenario2/vnf/vnf-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/scenario2/vswitch/vswitch-agent-cfg.yaml b/k8s/perf-demo/scenario2/vswitch/vswitch-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/scenario4/vnf/vnf-agent-cfg.yaml b/k8s/perf-demo/scenario4/vnf/vnf-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/scenario4/vswitch/vswitch-agent-cfg.yaml b/k8s/perf-demo/scenario4/vswitch/vswitch-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/with-controller/scenario1/sfc/sfc-cfg.yaml b/k8s/perf-demo/with-controller/scenario1/sfc/sfc-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
 
diff --git a/k8s/perf-demo/with-controller/scenario1/vnf/vnf-agent-cfg.yaml b/k8s/perf-demo/with-controller/scenario1/vnf/vnf-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/with-controller/scenario1/vswitch/vswitch-agent-cfg.yaml b/k8s/perf-demo/with-controller/scenario1/vswitch/vswitch-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/with-controller/scenario2/sfc/sfc-cfg.yaml b/k8s/perf-demo/with-controller/scenario2/sfc/sfc-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
 
diff --git a/k8s/perf-demo/with-controller/scenario2/vnf/vnf-agent-cfg.yaml b/k8s/perf-demo/with-controller/scenario2/vnf/vnf-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/with-controller/scenario2/vswitch/vswitch-agent-cfg.yaml b/k8s/perf-demo/with-controller/scenario2/vswitch/vswitch-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/with-controller/scenario23/sfc/sfc-cfg.yaml b/k8s/perf-demo/with-controller/scenario23/sfc/sfc-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
 
diff --git a/k8s/perf-demo/with-controller/scenario23/vnf/vnf-agent-cfg.yaml b/k8s/perf-demo/with-controller/scenario23/vnf/vnf-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/with-controller/scenario23/vswitch/vswitch-agent-cfg.yaml b/k8s/perf-demo/with-controller/scenario23/vswitch/vswitch-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/with-controller/scenario4/sfc/sfc-cfg.yaml b/k8s/perf-demo/with-controller/scenario4/sfc/sfc-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
 
diff --git a/k8s/perf-demo/with-controller/scenario4/vnf/vnf-agent-cfg.yaml b/k8s/perf-demo/with-controller/scenario4/vnf/vnf-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/perf-demo/with-controller/scenario4/vswitch/vswitch-agent-cfg.yaml b/k8s/perf-demo/with-controller/scenario4/vswitch/vswitch-agent-cfg.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/tests/vnf-vpp.yaml b/k8s/tests/vnf-vpp.yaml
@@ -22,7 +22,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/tests/vpp.yaml b/k8s/tests/vpp.yaml
@@ -22,7 +22,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/k8s/tests/vswitch-vpp.yaml b/k8s/tests/vswitch-vpp.yaml
@@ -21,7 +21,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   kafka.conf: |
diff --git a/plugins/govppmux/govpp.conf b/plugins/govppmux/govpp.conf
@@ -29,10 +29,10 @@ retry-request-count: 0
 
 # Defines timeout between binary API retry attempts in case some of them fails. Default value is 500ms.
 # If retry-request-count is set to zero, the field has no effect.
-retry-request-timeout: 500000000
+retry-request-timeout: 500ms
 
 # Defines max number of attempts GoVPPMux tries to reach the VPP (default is 3 attempts).
 retry-connect-count: 3
 
 # Defines time in nanoseconds between VPP connection retries (default is 1 second).
-retry-connect-timeout: 1000000000
+retry-connect-timeout: 1s
diff --git a/plugins/telemetry/telemetry.conf b/plugins/telemetry/telemetry.conf
@@ -1,5 +1,5 @@
-# Interval of data read procedure from the vpp in nanoseconds. Default value is 30 seconds.
-polling-interval: 30000000000
+# Interval of data read procedure from the vpp. Default value is 30 seconds.
+polling-interval: 30s
 
 # If set to true, telemetry plugin is disabled.
 disabled: false
diff --git a/tests/robot/resources/k8-yaml/sfc-k8.yaml b/tests/robot/resources/k8-yaml/sfc-k8.yaml
@@ -5,7 +5,7 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   sfc.conf: |
diff --git a/tests/robot/resources/k8-yaml/vswitch.yaml b/tests/robot/resources/k8-yaml/vswitch.yaml
@@ -29,12 +29,12 @@ metadata:
 data:
   etcd.conf: |
     insecure-transport: true
-    dial-timeout: 1000000000
+    dial-timeout: 1s
     endpoints:
      - "172.17.0.1:22379"
   govpp.conf: |
-    health-check-probe-interval: 1000000000
-    health-check-reply-timeout: 100000000
+    health-check-probe-interval: 1s
+    health-check-reply-timeout: 1s
     health-check-threshold: 1
   defaultplugins.conf: |
     stopwatch: true
diff --git a/vendor/github.com/ligato/cn-infra/Gopkg.lock b/vendor/github.com/ligato/cn-infra/Gopkg.lock
diff --git a/vendor/github.com/ligato/cn-infra/config/parser.go b/vendor/github.com/ligato/cn-infra/config/parser.go
diff --git a/vendor/github.com/ligato/cn-infra/logging/logmanager/logs.conf b/vendor/github.com/ligato/cn-infra/logging/logmanager/logs.conf
diff --git a/vendor/github.com/ligato/cn-infra/rpc/rest/security/password-hasher/main.go b/vendor/github.com/ligato/cn-infra/rpc/rest/security/password-hasher/main.go
