From d6c2bfabd086bac5ce29b6171643d06e1eca4bdd Mon Sep 17 00:00:00 2001 From: Daniel Adam Date: Fri, 9 Aug 2024 11:23:20 +0200 Subject: [PATCH] fixup! Migrate device-provisioning-service to repository --- .github/workflows/test.yml | 8 ++------ device-provisioning-service/test/test.go | 5 +++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a0716d810..6c998c19d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,6 @@ jobs: # test with check race with coverage and sonarcloud - name: test cmd: test-device-provisioning-service - args: TEST_COAP_GATEWAY_UDP_ENABLED=false checkRace: "true" coapGateway: log: @@ -38,7 +37,6 @@ jobs: - name: test/cqldb cmd: test-device-provisioning-service - args: TEST_COAP_GATEWAY_UDP_ENABLED=false checkRace: "true" database: "cqldb" coapGateway: @@ -49,7 +47,6 @@ jobs: # test without check race - name: test/norace cmd: test-device-provisioning-service - args: TEST_COAP_GATEWAY_UDP_ENABLED=false coapGateway: log: level: "debug" @@ -57,7 +54,6 @@ jobs: - name: test/norace/cqldb cmd: test-device-provisioning-service - args: TEST_COAP_GATEWAY_UDP_ENABLED=false database: "cqldb" coapGateway: log: @@ -70,7 +66,7 @@ jobs: # - with TEST_LEAD_RESOURCE_TYPE_FILTER, TEST_LEAD_RESOURCE_TYPE_USE_UUID - name: test/norace-384 cmd: test-device-provisioning-service - args: TEST_COAP_GATEWAY_UDP_ENABLED=false CERT_TOOL_SIGN_ALG=ECDSA-SHA384 CERT_TOOL_ELLIPTIC_CURVE=P384 TEST_LEAD_RESOURCE_TYPE_FILTER=last TEST_LEAD_RESOURCE_TYPE_USE_UUID=true + args: CERT_TOOL_SIGN_ALG=ECDSA-SHA384 CERT_TOOL_ELLIPTIC_CURVE=P384 TEST_LEAD_RESOURCE_TYPE_FILTER=last TEST_LEAD_RESOURCE_TYPE_USE_UUID=true # test # - without check race @@ -78,7 +74,7 @@ jobs: # - with logs from all services - name: test/norace/logs cmd: test-device-provisioning-service - args: TEST_COAP_GATEWAY_UDP_ENABLED=false TEST_LEAD_RESOURCE_TYPE_REGEX_FILTER='oic\.wk\.d,^/light/\d+$$' TEST_LEAD_RESOURCE_TYPE_FILTER=first + args: TEST_LEAD_RESOURCE_TYPE_REGEX_FILTER='oic\.wk\.d,^/light/\d+$$' TEST_LEAD_RESOURCE_TYPE_FILTER=first coapGateway: log: level: "debug" diff --git a/device-provisioning-service/test/test.go b/device-provisioning-service/test/test.go index 4fc2ff18b..506df2946 100644 --- a/device-provisioning-service/test/test.go +++ b/device-provisioning-service/test/test.go @@ -37,8 +37,8 @@ import ( ) const ( - DPSHost = "localhost:40030" - DPSHTTPHost = "localhost:40031" + DPSHost = "127.0.0.1:40030" + DPSHTTPHost = "127.0.0.1:40031" DPSEnrollmentGroupID = "6aa1aa8e-2b91-48ee-bfbc-a4e22d8e20d8" DPSOwner = "1" ) @@ -205,6 +205,7 @@ func MakeConfig(t require.TestingT) service.Config { Timeout: time.Second * 20, } cfg.APIs.COAP.BlockwiseTransfer.Enabled = config.COAP_GATEWAY_UDP_ENABLED + cfg.APIs.COAP.BlockwiseTransfer.Enabled = true cfg.APIs.COAP.BlockwiseTransfer.SZX = "1024" cfg.APIs.HTTP = MakeHTTPConfig() tlsServerCfg := config.MakeTLSServerConfig()