Address Ari's comments

https://mailarchive.ietf.org/arch/msg/asdf/q-o2DZ9RLtUdzyDEDxpzbMh5heU/

Author: rohitmohan96

openapi/ProtocolMap-BLE.yaml

@@ -19,20 +19,34 @@ components:
       type: object
       properties:
         ble:
-          required:
-            - serviceID
-            - characteristicID
-          type: object
-          properties:
-            serviceID:
-              type: string
-              format: uuid
-              example: 00001809-0000-1000-8000-00805f9b34fb
-            characteristicID:
-              type: string
-              format: uuid
-              example: 00002a1c-0000-1000-8000-00805f9b34fb
-              
+          oneOf:
+            - $ref: '#/components/schemas/BLE-Property'
+            - type: object
+              required:
+                - read
+                - write
+              properties:
+                read:
+                  $ref: '#/components/schemas/BLE-Property'
+                write:
+                  $ref: '#/components/schemas/BLE-Property'
+
+## Reusable BLE property object
+    BLE-Property:
+      required:
+        - serviceID
+        - characteristicID
+      type: object
+      properties:
+        serviceID:
+          type: string
+          format: uuid
+          example: 00001809-0000-1000-8000-00805f9b34fb
+        characteristicID:
+          type: string
+          format: uuid
+          example: 00002a1c-0000-1000-8000-00805f9b34fb
+
 ## Defines different types of BLE events
     ProtocolMap-BLE-Event:
       required:

openapi/ProtocolMap-Zigbee.yaml

@@ -19,32 +19,51 @@ components:
       type: object
       properties:
         zigbee:
-          required:
-            - endpointID
-            - clusterID
-            - attributeID
-          type: object
-          properties:
-            endpointID:
-              type: integer
-              format: int32
-              example: 1
-            clusterID:
-              type: integer
-              format: int32
-              example: 6
-            attributeID:
-              type: integer
-              format: int32
-              example: 16
-            type:
-              type: integer
-              format: int32
-              example: 1
-            profileID:
-              type: integer
-              format: int32
-              example: 260
+          oneOf:
+            - $ref: '#/components/schemas/Zigbee-Property'
+            - type: object
+              required:
+                - read
+                - write
+              properties:
+                read:
+                  $ref: '#/components/schemas/Zigbee-Property'
+                write:
+                  $ref: '#/components/schemas/Zigbee-Property'
+
+## Reusable Zigbee property object
+    Zigbee-Property:
+      required:
+        - endpointID
+        - clusterID
+        - attributeID
+        - attributeType
+      type: object
+      properties:
+        endpointID:
+          type: integer
+          format: int32
+          example: 1
+        clusterID:
+          type: integer
+          format: int32
+          example: 6
+        attributeID:
+          type: integer
+          format: int32
+          example: 16
+        attributeType:
+          type: integer
+          format: int32
+          example: 32
+        profileID:
+          type: integer
+          format: int32
+          example: 260
+        manufacturerCode:
+          type: integer
+          format: int32
+          example: 4174
 
     ProtocolMap-Zigbee-Event:
       required:
@@ -145,3 +164,37 @@ components:
                   example: connection_events
                   enum:
                     - connection_events
+
+## Protocol mapping for Zigbee action
+    ProtocolMap-Zigbee-Action:
+      required:
+        - zigbee
+      type: object
+      properties:
+        zigbee:
+          required:
+            - endpointID
+            - clusterID
+            - commandID
+          type: object
+          properties:
+            endpointID:
+              type: integer
+              format: int32
+              example: 1
+            clusterID:
+              type: integer
+              format: int32
+              example: 6
+            commandID:
+              type: integer
+              format: int32
+              example: 0
+            profileID:
+              type: integer
+              format: int32
+              example: 260
+            manufacturerCode:
+              type: integer
+              format: int32
+              example: 4174

openapi/ProtocolMap.yaml

@@ -31,4 +31,12 @@ components:
           oneOf:  
             - $ref: './ProtocolMap-BLE.yaml#/components/schemas/ProtocolMap-BLE-Event'
             - $ref: './ProtocolMap-Zigbee.yaml#/components/schemas/ProtocolMap-Zigbee-Event'
+
+## Protocol Map for an action
+    ProtocolMap-Action:
+      type: object
+      properties:
+        sdfProtocolMap:
+          oneOf:  
+            - $ref: './ProtocolMap-Zigbee.yaml#/components/schemas/ProtocolMap-Zigbee-Action'