Commit 7c158b59 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Reverting json change

parent 2ac34839
Loading
Loading
Loading
Loading
Loading
+199 −199
Original line number Original line Diff line number Diff line
@@ -66,6 +66,205 @@
      "type": "string",
      "type": "string",
      "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$"
      "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
    },
    "VLANID": {
      "type": "integer",
      "minimum": 0,
      "maximum": 4095
    },
    "VIN": {
      "type": "string",
      "pattern": "^[A-HJ-NPR-Z0-9]{17}$"
    },
    "ServiceAccessIdentifier": {
      "type": "string"
    },
    "EUICCID": {
      "type": "string",
      "pattern": "^[0-9]{32}$"
    },
    "APN": {
      "$ref": "#/$defs/LongString"
    },
    "DNN": {
      "$ref": "#/$defs/LongString"
    },
    "H323URI": {
      "allOf": [
        {
          "$ref": "#/$defs/ShortString"
        },
        {
          "type": "string",
          "pattern": "^h323:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$"
        }
      ]
    },
    "IMPU": {
      "allOf": [
        {
          "$ref": "#/$defs/ShortString"
        },
        {
          "type": "string",
          "pattern": "^[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$"
        }
      ]
    },
    "IMPI": {
      "$ref": "#/$defs/NAI"
    },
    "VRF": {
      "$ref": "#/$defs/ShortString"
    },
    "Percentage": {
      "type": "integer",
      "minimum": 0,
      "maximum": 100
    },
    "AltitudeMeters": {
      "type": "integer",
      "minimum": -1000,
      "maximum": 50000
    },
    "UncertaintyMeters": {
      "type": "integer",
      "minimum": 1
    },
    "FixMode": {
      "type": "string",
      "enum": [
        "unknown",
        "noFix",
        "fix2D",
        "fix3D"
      ]
    },
    "IPAddress": {
    "IPAddress": {
      "oneOf": [
      "oneOf": [
        {
        {
@@ -118,11 +317,6 @@
        }
        }
      ]
      ]
    },
    },
    "TCPPort": {
      "type": "integer",
      "exclusiveMinimum": 1,
      "maximum": 65535
    },
    "TCPPortRange": {
    "TCPPortRange": {
      "type": "object",
      "type": "object",
      "properties": {
      "properties": {
@@ -139,11 +333,6 @@
      ],
      ],
      "additionalProperties": false
      "additionalProperties": false
    },
    },
    "UDPPort": {
      "type": "integer",
      "minimum": 0,
      "maximum": 65535
    },
    "UDPPortRange": {
    "UDPPortRange": {
      "type": "object",
      "type": "object",
      "properties": {
      "properties": {
@@ -244,37 +433,6 @@
      ],
      ],
      "additionalProperties": false
      "additionalProperties": false
    },
    },
    "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!#$&-;=?-\\[\\]_~%]+$"
    },
    "WGS84CoordinateDecimal": {
    "WGS84CoordinateDecimal": {
      "type": "object",
      "type": "object",
      "properties": {
      "properties": {
@@ -291,14 +449,6 @@
      ],
      ],
      "additionalProperties": false
      "additionalProperties": false
    },
    },
    "WGS84LatitudeDecimal": {
      "type": "string",
      "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$"
    },
    "WGS84LongitudeDecimal": {
      "type": "string",
      "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$"
    },
    "WGS84CoordinateAngular": {
    "WGS84CoordinateAngular": {
      "type": "object",
      "type": "object",
      "properties": {
      "properties": {
@@ -315,143 +465,6 @@
      ],
      ],
      "additionalProperties": false
      "additionalProperties": false
    },
    },
    "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"
    },
    "NAI": {
      "type": "string"
    },
    "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"
    },
    "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
    },
    "VLANID": {
      "type": "integer",
      "minimum": 0,
      "maximum": 4095
    },
    "VIN": {
      "type": "string",
      "pattern": "^[A-HJ-NPR-Z0-9]{17}$"
    },
    "ServiceAccessIdentifier": {
      "type": "string"
    },
    "EUICCID": {
      "type": "string",
      "pattern": "^[0-9]{32}$"
    },
    "APN": {
      "$ref": "#/$defs/LongString"
    },
    "DNN": {
      "$ref": "#/$defs/LongString"
    },
    "H323URI": {
      "allOf": [
        {
          "$ref": "#/$defs/ShortString"
        },
        {
          "type": "string",
          "pattern": "^h323:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$"
        }
      ]
    },
    "IMPU": {
      "allOf": [
        {
          "$ref": "#/$defs/ShortString"
        },
        {
          "type": "string",
          "pattern": "^[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$"
        }
      ]
    },
    "IMPI": {
      "$ref": "#/$defs/NAI"
    },
    "VRF": {
      "$ref": "#/$defs/ShortString"
    },
    "Percentage": {
      "type": "integer",
      "minimum": 0,
      "maximum": 100
    },
    "AltitudeMeters": {
      "type": "integer",
      "minimum": -1000,
      "maximum": 50000
    },
    "Altitude": {
    "Altitude": {
      "oneOf": [
      "oneOf": [
        {
        {
@@ -478,10 +491,6 @@
        }
        }
      ]
      ]
    },
    },
    "UncertaintyMeters": {
      "type": "integer",
      "minimum": 1
    },
    "GNSSLocation": {
    "GNSSLocation": {
      "type": "object",
      "type": "object",
      "properties": {
      "properties": {
@@ -644,15 +653,6 @@
        "etsi280:uncertaintyLatitude"
        "etsi280:uncertaintyLatitude"
      ],
      ],
      "additionalProperties": false
      "additionalProperties": false
    },
    "FixMode": {
      "type": "string",
      "enum": [
        "unknown",
        "noFix",
        "fix2D",
        "fix3D"
      ]
    }
    }
  }
  }
}
}