fixup! Migrate device-provisioning-service to repository

plgd-dev · Aug 9, 2024 · d6c2bfa · d6c2bfa
1 parent eed9143
commit d6c2bfa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git 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,15 +47,13 @@ jobs:
           # test without check race
           - name: test/norace
             cmd: test-device-provisioning-service
-            args: TEST_COAP_GATEWAY_UDP_ENABLED=false
             coapGateway:
               log:
                 level: "debug"
                 dumpBody: "true"
 
           - name: test/norace/cqldb
             cmd: test-device-provisioning-service
-            args: TEST_COAP_GATEWAY_UDP_ENABLED=false
             database: "cqldb"
             coapGateway:
               log:
@@ -70,15 +66,15 @@ 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
           #   - with TEST_LEAD_RESOURCE_TYPE_FILTER, TEST_LEAD_RESOURCE_TYPE_REGEX_FILTER
           #   - 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
@@ -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()