Commit f883ca8c authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing merge conflict

parents ec148995 f3eaba6d

103705/config.json

+50 −48
Original line number Diff line number Diff line 
[{

[

  {

    "coreSchema": "schema/response.schema.json",

    "supportingSchemas": [

      "../103280/TS_103_280.schema.json",
@@ -55,4 +56,5 @@ 
    "exampleFiles": [

      "examples/example5/csp_results.json"

    ]

}]
 
 No newline at end of file
 
  }

]

103705/examples/example1/csp_records.schema.json

+36 −17
Original line number Diff line number Diff line
@@ -9,16 +9,35 @@ 
  "version": "1.1.1",

  "$defs": {

    "record": {

        "oneOf" : [{

      "oneOf": [

        {

          "allOf": [

            { "$ref" : "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/CallRecord" },

            { "properties" : { "type" : { "const" : "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/CallRecord"}}}

          ]},

            {

              "$ref": "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/CallRecord"

            },

            {

              "properties": {

                "type": {

                  "const": "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/CallRecord"

                }

              }

            }

          ]

        },

        {

          "allOf": [

              { "$ref" : "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/MessagingRecord" },

              { "properties" : { "type" : { "const" : "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/MessagingRecord"}}}

            ]}            

            {

              "$ref": "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/MessagingRecord"

            },

            {

              "properties": {

                "type": {

                  "const": "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/MessagingRecord"

                }

              }

            }

          ]

        }

      ]

    }

  }

103705/examples/example1/csp_results.json

+49 −41
Original line number Diff line number Diff line
@@ -18,12 +18,16 @@ 
      "endReason": 16,

      "parties": [

        {

                    "identity": {"phoneNumber": "491713920067"},

          "identity": {

            "phoneNumber": "491713920067"

          },

          "role": "originating",

          "initialAccessTechnology": "5G"

        },

        {

                    "identity": {"phoneNumber": "441632960123"},

          "identity": {

            "phoneNumber": "441632960123"

          },

          "role": "terminating"

        }

      ]
@@ -34,11 +38,15 @@ 
      "eventTime": "2024-04-18T10:04:00.000000Z",

      "parties": [

        {

                    "identity": {"phoneNumber": "441632960123"},

          "identity": {

            "phoneNumber": "441632960123"

          },

          "role": "sender"

        },

        {

                    "identity": {"phoneNumber": "491713920067"},

          "identity": {

            "phoneNumber": "491713920067"

          },

          "role": "receiver"

        }

      ]

103705/examples/example2/csp_records.schema.json

+35 −16
Original line number Diff line number Diff line
@@ -9,16 +9,35 @@ 
  "version": "1.1.1",

  "$defs": {

    "record": {

          "oneOf" : [{

      "oneOf": [

        {

          "allOf": [

              { "$ref" : "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/CallRecord" },

              { "properties" : { "type" : { "const" : "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/CallRecord"}}}

            ]},

            {

              "$ref": "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/CallRecord"

            },

            {

              "properties": {

                "type": {

                  "const": "urn:etsi:li:103705:type-schema-id:v1.1.1#/$defs/CallRecord"

                }

              }

            }

          ]

        },

        {

          "allOf": [

                { "$ref" : "csp_example_types#/$defs/CSPMessagingRecord" },

                { "properties" : { "type" : { "const" : "csp_example_types#/$defs/CSPMessagingRecord"}}}

              ]}            

            {

              "$ref": "csp_example_types#/$defs/CSPMessagingRecord"

            },

            {

              "properties": {

                "type": {

                  "const": "csp_example_types#/$defs/CSPMessagingRecord"

                }

              }

            }

          ]

        }

      ]

    }

  }

103705/examples/example2/csp_results.json

+49 −41
Original line number Diff line number Diff line
@@ -18,11 +18,15 @@ 
      "endReason": 16,

      "parties": [

        {

                    "identity": {"phoneNumber": "491713920067"},

          "identity": {

            "phoneNumber": "491713920067"

          },

          "role": "originating"

        },

        {

                    "identity": {"phoneNumber": "441632960123"},

          "identity": {

            "phoneNumber": "441632960123"

          },

          "role": "terminating"

        }

      ]
@@ -33,11 +37,15 @@ 
      "eventTime": "2024-04-18T10:04:00.000000Z",

      "parties": [

        {

                    "identity": {"phoneNumber": "441632960123"},

          "identity": {

            "phoneNumber": "441632960123"

          },

          "role": "sender"

        },

        {

                    "identity": {"phoneNumber": "491713920067"},

          "identity": {

            "phoneNumber": "491713920067"

          },

          "role": "receiver"

        }

      ],