Commit 6b3953e6 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing namespace qualifiers for choice

parent 25b554c8
Loading
Loading
Loading
Loading
Loading
+389 −0
Original line number Diff line number Diff line
{
  "$id": "ts_103280_2017_07",
  "$defs": {
    "ShortString": {
      "type": "string",
      "maxLength": 255
    },
    "LongString": {
      "type": "string",
      "maxLength": 65535
    },
    "LIID": {
      "type": "string",
      "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$"
    },
    "UTCDateTime": {
      "type": "string",
      "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$"
    },
    "UTCMicrosecondDateTime": {
      "type": "string",
      "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$"
    },
    "QualifiedDateTime": {
      "type": "string",
      "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$"
    },
    "QualifiedMicrosecondDateTime": {
      "type": "string",
      "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$"
    },
    "InternationalE164": {
      "type": "string",
      "pattern": "^[0-9]{1,15}$"
    },
    "IMSI": {
      "type": "string",
      "pattern": "^[0-9]{6,15}$"
    },
    "IMEI": {
      "type": "string",
      "pattern": "^[0-9]{14}$"
    },
    "IMEICheckDigit": {
      "type": "string",
      "pattern": "^[0-9]{15}$"
    },
    "IMEISV": {
      "type": "string",
      "pattern": "^[0-9]{16}$"
    },
    "IPv4Address": {
      "type": "string",
      "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$"
    },
    "IPv4CIDR": {
      "type": "string",
      "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$"
    },
    "IPv6Address": {
      "type": "string",
      "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$"
    },
    "IPv6CIDR": {
      "type": "string",
      "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$"
    },
    "TCPPort": {
      "type": "integer",
      "exclusiveMinimum": 1,
      "maximum": 65535
    },
    "UDPPort": {
      "type": "integer",
      "minimum": 0,
      "maximum": 65535
    },
    "MACAddress": {
      "type": "string",
      "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$"
    },
    "EmailAddress": {
      "allOf": [
        {
          "$ref": "#/$defs/ShortString"
        },
        {
          "type": "string",
          "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
        }
      ]
    },
    "UUID": {
      "type": "string",
      "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
    },
    "ISOCountryCode": {
      "type": "string",
      "pattern": "^[A-Z]{2}$"
    },
    "SIPURI": {
      "type": "string",
      "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$"
    },
    "TELURI": {
      "type": "string",
      "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$"
    },
    "WGS84LatitudeDecimal": {
      "type": "string",
      "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$"
    },
    "WGS84LongitudeDecimal": {
      "type": "string",
      "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$"
    },
    "WGS84LatitudeAngular": {
      "type": "string",
      "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$"
    },
    "WGS84LongitudeAngular": {
      "type": "string",
      "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$"
    },
    "SUPIIMSI": {
      "$ref": "#/$defs/IMSI"
    },
    "SUPINAI": {
      "$ref": "#/$defs/NAI"
    },
    "SUCI": {
      "type": "string",
      "pattern": "^([a-fA-F0-9]{2})*$"
    },
    "PEIIMEI": {
      "$ref": "#/$defs/IMEI"
    },
    "PEIIMEICheckDigit": {
      "$ref": "#/$defs/IMEICheckDigit"
    },
    "PEIIMEISV": {
      "$ref": "#/$defs/IMEISV"
    },
    "GPSIMSISDN": {
      "type": "string",
      "pattern": "^[0-9]{1,15}$"
    },
    "GPSINAI": {
      "$ref": "#/$defs/NAI"
    },
    "NAI": {
      "type": "string"
    },
    "LDID": {
      "type": "string",
      "pattern": "^([A-Z]{2}-.+-.+)$"
    },
    "InternationalizedEmailAddress": {
      "allOf": [
        {
          "$ref": "#/$defs/ShortString"
        },
        {
          "type": "string",
          "pattern": "^.+@.+$"
        }
      ]
    },
    "EUI64": {
      "type": "string",
      "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$"
    },
    "CGI": {
      "type": "string",
      "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$"
    },
    "ECGI": {
      "type": "string",
      "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$"
    },
    "NCGI": {
      "type": "string",
      "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$"
    },
    "ICCID": {
      "type": "string",
      "pattern": "^[0-9]{19,20}$"
    },
    "IPProtocol": {
      "type": "integer",
      "minimum": 0,
      "maximum": 255
    },
    "IPAddress": {
      "oneOf": [
        {
          "type": "object",
          "properties": {
            "etsi280:IPv4Address": {
              "$ref": "#/$defs/IPv4Address"
            }
          },
          "required": [
            "etsi280:IPv4Address"
          ]
        },
        {
          "type": "object",
          "properties": {
            "etsi280:IPv6Address": {
              "$ref": "#/$defs/IPv6Address"
            }
          },
          "required": [
            "etsi280:IPv6Address"
          ]
        }
      ]
    },
    "IPCIDR": {
      "oneOf": [
        {
          "type": "object",
          "properties": {
            "etsi280:IPv4CIDR": {
              "$ref": "#/$defs/IPv4CIDR"
            }
          },
          "required": [
            "etsi280:IPv4CIDR"
          ]
        },
        {
          "type": "object",
          "properties": {
            "etsi280:IPv6CIDR": {
              "$ref": "#/$defs/IPv6CIDR"
            }
          },
          "required": [
            "etsi280:IPv6CIDR"
          ]
        }
      ]
    },
    "TCPPortRange": {
      "type": "object",
      "properties": {
        "etsi280:start": {
          "$ref": "#/$defs/TCPPort"
        },
        "etsi280:end": {
          "$ref": "#/$defs/TCPPort"
        }
      },
      "required": [
        "etsi280:start",
        "etsi280:end"
      ]
    },
    "UDPPortRange": {
      "type": "object",
      "properties": {
        "etsi280:start": {
          "$ref": "#/$defs/UDPPort"
        },
        "etsi280:end": {
          "$ref": "#/$defs/UDPPort"
        }
      },
      "required": [
        "etsi280:start",
        "etsi280:end"
      ]
    },
    "Port": {
      "oneOf": [
        {
          "type": "object",
          "properties": {
            "etsi280:TCPPort": {
              "$ref": "#/$defs/TCPPort"
            }
          },
          "required": [
            "etsi280:TCPPort"
          ]
        },
        {
          "type": "object",
          "properties": {
            "etsi280:UDPPort": {
              "$ref": "#/$defs/UDPPort"
            }
          },
          "required": [
            "etsi280:UDPPort"
          ]
        }
      ]
    },
    "PortRange": {
      "oneOf": [
        {
          "type": "object",
          "properties": {
            "etsi280:TCPPortRange": {
              "$ref": "#/$defs/TCPPortRange"
            }
          },
          "required": [
            "etsi280:TCPPortRange"
          ]
        },
        {
          "type": "object",
          "properties": {
            "etsi280:UDPPortRange": {
              "$ref": "#/$defs/UDPPortRange"
            }
          },
          "required": [
            "etsi280:UDPPortRange"
          ]
        }
      ]
    },
    "IPAddressPort": {
      "type": "object",
      "properties": {
        "etsi280:address": {
          "$ref": "#/$defs/IPAddress"
        },
        "etsi280:port": {
          "$ref": "#/$defs/Port"
        }
      },
      "required": [
        "etsi280:address",
        "etsi280:port"
      ]
    },
    "IPAddressPortRange": {
      "type": "object",
      "properties": {
        "etsi280:address": {
          "$ref": "#/$defs/IPAddress"
        },
        "etsi280:portRange": {
          "$ref": "#/$defs/PortRange"
        }
      },
      "required": [
        "etsi280:address",
        "etsi280:portRange"
      ]
    },
    "WGS84CoordinateDecimal": {
      "type": "object",
      "properties": {
        "etsi280:latitude": {
          "$ref": "#/$defs/WGS84LatitudeDecimal"
        },
        "etsi280:longitude": {
          "$ref": "#/$defs/WGS84LongitudeDecimal"
        }
      },
      "required": [
        "etsi280:latitude",
        "etsi280:longitude"
      ]
    },
    "WGS84CoordinateAngular": {
      "type": "object",
      "properties": {
        "etsi280:latitude": {
          "$ref": "#/$defs/WGS84LatitudeAngular"
        },
        "etsi280:longitude": {
          "$ref": "#/$defs/WGS84LongitudeAngular"
        }
      },
      "required": [
        "etsi280:latitude",
        "etsi280:longitude"
      ]
    }
  }
}
 No newline at end of file
+4 −4
Original line number Diff line number Diff line
@@ -87,12 +87,12 @@
        {
          "type": "object",
          "properties": {
            "NationalApproverIdentity": {
            "common:NationalApproverIdentity": {
              "$ref": "#/$defs/NationalApproverIdentity"
            }
          },
          "required": [
            "NationalApproverIdentity"
            "common:NationalApproverIdentity"
          ]
        }
      ]
@@ -128,12 +128,12 @@
        {
          "type": "object",
          "properties": {
            "NationalDigitalSignature": {
            "common:NationalDigitalSignature": {
              "$ref": "#/$defs/NationalDigitalSignature"
            }
          },
          "required": [
            "NationalDigitalSignature"
            "common:NationalDigitalSignature"
          ]
        }
      ]
+16 −16
Original line number Diff line number Diff line
@@ -63,23 +63,23 @@
        {
          "type": "object",
          "properties": {
            "LDID": {
            "delivery:LDID": {
              "$ref": "ts_103280_2017_07#/$defs/LDID"
            }
          },
          "required": [
            "LDID"
            "delivery:LDID"
          ]
        },
        {
          "type": "object",
          "properties": {
            "LIID": {
            "delivery:LIID": {
              "$ref": "ts_103280_2017_07#/$defs/LIID"
            }
          },
          "required": [
            "LIID"
            "delivery:LIID"
          ]
        }
      ]
@@ -89,23 +89,23 @@
        {
          "type": "object",
          "properties": {
            "Specification": {
            "delivery:Specification": {
              "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
            }
          },
          "required": [
            "Specification"
            "delivery:Specification"
          ]
        },
        {
          "type": "object",
          "properties": {
            "ExternalSchema": {
            "delivery:ExternalSchema": {
              "$ref": "#/$defs/ExternalSchema"
            }
          },
          "required": [
            "ExternalSchema"
            "delivery:ExternalSchema"
          ]
        }
      ]
@@ -127,23 +127,23 @@
        {
          "type": "object",
          "properties": {
            "BinaryData": {
            "delivery:BinaryData": {
              "$ref": "#/$defs/EmbeddedBinaryData"
            }
          },
          "required": [
            "BinaryData"
            "delivery:BinaryData"
          ]
        },
        {
          "type": "object",
          "properties": {
            "XMLSchema": {
            "delivery:XMLSchema": {
              "$ref": "#/$defs/SchemaContent"
            }
          },
          "required": [
            "XMLSchema"
            "delivery:XMLSchema"
          ]
        }
      ]
@@ -162,23 +162,23 @@
        {
          "type": "object",
          "properties": {
            "BinaryData": {
            "delivery:BinaryData": {
              "$ref": "#/$defs/EmbeddedBinaryData"
            }
          },
          "required": [
            "BinaryData"
            "delivery:BinaryData"
          ]
        },
        {
          "type": "object",
          "properties": {
            "XMLData": {
            "delivery:XMLData": {
              "$ref": "#/$defs/EmbeddedXMLData"
            }
          },
          "required": [
            "XMLData"
            "delivery:XMLData"
          ]
        }
      ]
+22 −22
Original line number Diff line number Diff line
@@ -202,122 +202,122 @@
        {
          "type": "object",
          "properties": {
            "IPv4Address": {
            "task:IPv4Address": {
              "$ref": "ts_103280_2017_07#/$defs/IPv4Address"
            }
          },
          "required": [
            "IPv4Address"
            "task:IPv4Address"
          ]
        },
        {
          "type": "object",
          "properties": {
            "IPv6Address": {
            "task:IPv6Address": {
              "$ref": "ts_103280_2017_07#/$defs/IPv6Address"
            }
          },
          "required": [
            "IPv6Address"
            "task:IPv6Address"
          ]
        },
        {
          "type": "object",
          "properties": {
            "IPAddressPort": {
            "task:IPAddressPort": {
              "$ref": "ts_103280_2017_07#/$defs/IPAddressPort"
            }
          },
          "required": [
            "IPAddressPort"
            "task:IPAddressPort"
          ]
        },
        {
          "type": "object",
          "properties": {
            "IPAddressPortRange": {
            "task:IPAddressPortRange": {
              "$ref": "ts_103280_2017_07#/$defs/IPAddressPortRange"
            }
          },
          "required": [
            "IPAddressPortRange"
            "task:IPAddressPortRange"
          ]
        },
        {
          "type": "object",
          "properties": {
            "E164Number": {
            "task:E164Number": {
              "$ref": "ts_103280_2017_07#/$defs/InternationalE164"
            }
          },
          "required": [
            "E164Number"
            "task:E164Number"
          ]
        },
        {
          "type": "object",
          "properties": {
            "FTPAddress": {
            "task:FTPAddress": {
              "type": "string"
            }
          },
          "required": [
            "FTPAddress"
            "task:FTPAddress"
          ]
        },
        {
          "type": "object",
          "properties": {
            "URL": {
            "task:URL": {
              "type": "string"
            }
          },
          "required": [
            "URL"
            "task:URL"
          ]
        },
        {
          "type": "object",
          "properties": {
            "FQDN": {
            "task:FQDN": {
              "$ref": "ts_103280_2017_07#/$defs/LongString"
            }
          },
          "required": [
            "FQDN"
            "task:FQDN"
          ]
        },
        {
          "type": "object",
          "properties": {
            "EmailAddress": {
            "task:EmailAddress": {
              "$ref": "ts_103280_2017_07#/$defs/EmailAddress"
            }
          },
          "required": [
            "EmailAddress"
            "task:EmailAddress"
          ]
        },
        {
          "type": "object",
          "properties": {
            "EndpointID": {
            "task:EndpointID": {
              "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID"
            }
          },
          "required": [
            "EndpointID"
            "task:EndpointID"
          ]
        },
        {
          "type": "object",
          "properties": {
            "DeliveryInformationID": {
            "task:DeliveryInformationID": {
              "$ref": "ts_103280_2017_07#/$defs/LongString"
            }
          },
          "required": [
            "DeliveryInformationID"
            "task:DeliveryInformationID"
          ]
        }
      ]
+4 −4
Original line number Diff line number Diff line
@@ -136,23 +136,23 @@
        {
          "type": "object",
          "properties": {
            "IPPolicyCriteria": {
            "tp:IPPolicyCriteria": {
              "$ref": "#/$defs/IPPolicyCriteria"
            }
          },
          "required": [
            "IPPolicyCriteria"
            "tp:IPPolicyCriteria"
          ]
        },
        {
          "type": "object",
          "properties": {
            "MobileAccessPolicyCriteria": {
            "tp:MobileAccessPolicyCriteria": {
              "$ref": "#/$defs/MobileAccessPolicyCriteria"
            }
          },
          "required": [
            "MobileAccessPolicyCriteria"
            "tp:MobileAccessPolicyCriteria"
          ]
        }
      ]
Loading