fix for observable oic/d and oic/p

Author: jkralik

cloud2cloud-gateway/service/retrieveDevice_test.go

@@ -104,7 +104,7 @@ func getDeviceAllRepresentation(deviceID, deviceName string) interface{} {
 				"href": "/" + deviceID + "/oic/d",
 				"if":   []interface{}{"oic.if.r", "oic.if.baseline"},
 				"p": map[interface{}]interface{}{
-					"bm": uint64(0x1), "port": uint64(0x0), "sec": false, "x.org.iotivity.tcp": uint64(0x0), "x.org.iotivity.tls": uint64(0x0),
+					"bm": uint64(0x3), "port": uint64(0x0), "sec": false, "x.org.iotivity.tcp": uint64(0x0), "x.org.iotivity.tls": uint64(0x0),
 				},
 				"rt": []interface{}{"oic.d.cloudDevice", "oic.wk.d"},
 			},
@@ -122,7 +122,7 @@ func getDeviceAllRepresentation(deviceID, deviceName string) interface{} {
 				"href": "/" + deviceID + "/oic/p",
 				"if":   []interface{}{"oic.if.r", "oic.if.baseline"},
 				"p": map[interface{}]interface{}{
-					"bm": uint64(0x1), "port": uint64(0x0), "sec": false, "x.org.iotivity.tcp": uint64(0x0), "x.org.iotivity.tls": uint64(0x0),
+					"bm": uint64(0x3), "port": uint64(0x0), "sec": false, "x.org.iotivity.tcp": uint64(0x0), "x.org.iotivity.tls": uint64(0x0),
 				},
 				"rt": []interface{}{"oic.wk.p"},
 			},

http-gateway/test/test.go

@@ -173,6 +173,6 @@ func CleanUpDeviceRepresentation(v interface{}) interface{} {
 
 func GetDeviceRepresentation(deviceID string, deviceName string) interface{} {
 	return CleanUpDeviceRepresentation(
-		map[interface{}]interface{}{"device": map[interface{}]interface{}{"di": deviceID, "dmn": []interface{}{}, "dmno": "", "if": []interface{}{"oic.if.r", "oic.if.baseline"}, "n": deviceName, "rt": []interface{}{"oic.d.cloudDevice", "oic.wk.d"}}, "links": []interface{}{map[interface{}]interface{}{"di": deviceID, "href": "/light/1", "id": utils.MakeResourceId(deviceID, status.Href), "if": []interface{}{"oic.if.rw", "oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(3), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{"core.light"}}, map[interface{}]interface{}{"di": deviceID, "href": "/light/2", "id": "d72a96bd-449a-51f1-a7d3-71f4ccad8d00", "if": []interface{}{"oic.if.rw", "oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(3), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{"core.light"}}, map[interface{}]interface{}{"di": deviceID, "href": "/oc/con", "id": "b67202b3-6bd7-5f0b-ada0-83b7e985cef4", "if": []interface{}{"oic.if.rw", "oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(3), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{"oic.wk.con"}}, map[interface{}]interface{}{"di": deviceID, "href": status.Href, "id": "585a9ced-1953-50d6-b4f2-4630c478e1bc", "if": []interface{}{"oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(3), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{status.ResourceType}, "title": status.Title}, map[interface{}]interface{}{"di": deviceID, "href": "/oic/d", "id": "7013279c-4f28-503f-9425-d76ae580c590", "if": []interface{}{"oic.if.r", "oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(1), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{"oic.d.cloudDevice", "oic.wk.d"}}, map[interface{}]interface{}{"di": deviceID, "href": "/oic/p", "id": "d6940aea-d1b5-53dd-a123-838b73b02d10", "if": []interface{}{"oic.if.r", "oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(1), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{"oic.wk.p"}}}, "status": "online"},
+		map[interface{}]interface{}{"device": map[interface{}]interface{}{"di": deviceID, "dmn": []interface{}{}, "dmno": "", "if": []interface{}{"oic.if.r", "oic.if.baseline"}, "n": deviceName, "rt": []interface{}{"oic.d.cloudDevice", "oic.wk.d"}}, "links": []interface{}{map[interface{}]interface{}{"di": deviceID, "href": "/light/1", "id": utils.MakeResourceId(deviceID, status.Href), "if": []interface{}{"oic.if.rw", "oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(3), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{"core.light"}}, map[interface{}]interface{}{"di": deviceID, "href": "/light/2", "id": "d72a96bd-449a-51f1-a7d3-71f4ccad8d00", "if": []interface{}{"oic.if.rw", "oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(3), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{"core.light"}}, map[interface{}]interface{}{"di": deviceID, "href": "/oc/con", "id": "b67202b3-6bd7-5f0b-ada0-83b7e985cef4", "if": []interface{}{"oic.if.rw", "oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(3), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{"oic.wk.con"}}, map[interface{}]interface{}{"di": deviceID, "href": status.Href, "id": "585a9ced-1953-50d6-b4f2-4630c478e1bc", "if": []interface{}{"oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(3), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{status.ResourceType}, "title": status.Title}, map[interface{}]interface{}{"di": deviceID, "href": "/oic/d", "id": "7013279c-4f28-503f-9425-d76ae580c590", "if": []interface{}{"oic.if.r", "oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(3), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{"oic.d.cloudDevice", "oic.wk.d"}}, map[interface{}]interface{}{"di": deviceID, "href": "/oic/p", "id": "d6940aea-d1b5-53dd-a123-838b73b02d10", "if": []interface{}{"oic.if.r", "oic.if.baseline"}, "p": map[interface{}]interface{}{"bm": uint64(3), "port": uint64(0), "sec": false, "x.org.iotivity.tcp": uint64(0), "x.org.iotivity.tls": uint64(0)}, "rt": []interface{}{"oic.wk.p"}}}, "status": "online"},
 	)
 }

test/test.go

@@ -63,7 +63,7 @@ func init() {
 			ResourceTypes: []string{"oic.wk.p"},
 			Interfaces:    []string{"oic.if.r", "oic.if.baseline"},
 			Policy: &schema.Policy{
-				BitMask: 1,
+				BitMask: 3,
 			},
 		},
 
@@ -72,7 +72,7 @@ func init() {
 			ResourceTypes: []string{"oic.d.cloudDevice", "oic.wk.d"},
 			Interfaces:    []string{"oic.if.r", "oic.if.baseline"},
 			Policy: &schema.Policy{
-				BitMask: 1,
+				BitMask: 3,
 			},
 		},