Updated cfm header

Author: anjan-keysight

flow/packet-headers/cfm.yaml

@@ -4,22 +4,6 @@ components:
       description: Defines the fields of a Connectivity Fault Management (CFM)
         Packet Data Unit (PDU) as specified by IEEE 802.1.
       type: object
-      properties:
-        common_header:
-          $ref: '#/components/schemas/Flow.Cfm.CommonHdr'
-          x-field-uid: 1
-        select_packet_header:
-          $ref: '#/components/schemas/Flow.Cfm.SelectPktHdr'
-          x-field-uid: 2
-        tlvs:
-          type: array
-          minItems: 1
-          items:
-            $ref: '#/components/schemas/Flow.Cfm.Tlvs'
-          x-field-uid: 3
-    Flow.Cfm.CommonHdr:
-      description: Defines the CFM message header.
-      type: object
       properties:
         md_level:
           x-field-pattern:
@@ -89,6 +73,15 @@ components:
             features:
               - count
           x-field-uid: 5
+        select_packet_header:
+          $ref: '#/components/schemas/Flow.Cfm.SelectPktHdr'
+          x-field-uid: 6
+        tlvs:
+          type: array
+          minItems: 1
+          items:
+            $ref: '#/components/schemas/Flow.Cfm.Tlvs'
+          x-field-uid: 7
     Flow.Cfm.SelectPktHdr:
       description: Select message header. Currently only Continuity Check Message 
         (CCM) is supported.
@@ -159,40 +152,126 @@ components:
             x-enum:
               maid_present:
                 x-field-uid: 1
+              maid_not_present:
+                x-field-uid: 2
         maid_present:
           $ref: '#/components/schemas/Flow.Cfm.MAIDPresent'
           x-field-uid: 2
+        maid_not_present:
+          $ref: '#/components/schemas/Flow.Cfm.MAIDNotPresent'
+          x-field-uid: 3
     Flow.Cfm.MAIDPresent:
-      description: Maintenance association endPoint identifier
+      description: Maintenance domain present
       type: object
       properties:
         md_name_format:
+          description: >-
+            Maintenance domain name format
+          type: string
+          default: char_str
+          x-enum:
+            domain_name_str:
+              x-field-uid: 1
+            mac_addr:
+              x-field-uid: 2
+            char_str:
+              x-field-uid: 3
+          x-field-uid: 1
+        md_name_length:
           x-field-pattern:
             description: >-
-              Maintenance domain name format
+              Maintenance domain name length
             format: integer
             length: 8
-            default: 4
+            default: 1
             features:
               - count
-          x-field-uid: 1
-        md_name_length:
+          x-field-uid: 2
+        md_name:
+          description: >-
+            Maintenance domain name
+          type: string
+          format: hex
+          default: '00'
+          x-field-uid: 3
+        short_ma_name_format:
+          description: >-
+            Short MA name format
+          type: string
+          default: char_str
+          x-enum:
+            primary_vid:
+              x-field-uid: 1
+            char_str:
+              x-field-uid: 2
+            two_oct_int:
+              x-field-uid: 3
+            rfc_2685_vpn_id:
+              x-field-uid: 4
+          x-field-uid: 4
+        short_ma_name_length:
           x-field-pattern:
             description: >-
-              Maintenance domain name format
+              Short MA name length
             format: integer
             length: 8
             default: 1
             features:
               - count
-          x-field-uid: 2
-        md_name:
+          x-field-uid: 5
+        short_ma_name:
           description: >-
-            Maintenance domain name format
+            Short MA name
           type: string
           format: hex
           default: '00'
+          x-field-uid: 6
+    Flow.Cfm.MAIDNotPresent:
+      description: Maintenance domain not present
+      type: object
+      properties:
+        md_name_format:
+          x-field-pattern:
+            description: >-
+              Maintenance domain name format
+            format: integer
+            length: 8
+            default: 1
+            features:
+              - auto
+          x-field-uid: 1
+        short_ma_name_format:
+          description: >-
+            Short MA name format
+          type: string
+          default: char_str
+          x-enum:
+            primary_vid:
+              x-field-uid: 1
+            char_str:
+              x-field-uid: 2
+            two_oct_int:
+              x-field-uid: 3
+            rfc_2685_vpn_id:
+              x-field-uid: 4
+          x-field-uid: 2
+        short_ma_name_length:
+          x-field-pattern:
+            description: >-
+              Short MA name length
+            format: integer
+            length: 8
+            default: 1
+            features:
+              - count
           x-field-uid: 3
+        short_ma_name:
+          description: >-
+            Short MA name
+          type: string
+          format: hex
+          default: '00'
+          x-field-uid: 4
     Flow.Cfm.Tlvs:
       description: The CFM TLV format is defined in 8021Q. Common fields are
         Type (1 octet) defined by choice below, Length (2 octet) and Value (variable)