Commit 91c7cf53 authored by canterafonsj's avatar canterafonsj
Browse files

Getting closer

parent 9a59ea70

schema/Subscription.json

+160 −164
Original line number Diff line number Diff line
@@ -6,11 +6,6 @@ 
  "definitions": {

    "NotificationParams": {

      "type": "object",

      "properties": {

        "type": "object",

        "required": [

          "endpoint"

        ],

      "properties": {

        "attributes": {

          "type": "array",
@@ -23,7 +18,7 @@ 
          "type": "string"

        },

        "endpoint": {

            "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/EndPoint"

          "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/Endpoint"

        },

        "status": {

          "type": "string",
@@ -48,9 +43,14 @@ 
          "type": "string",

          "format": "date-time"

        }

        }

      },

      "EntityInfo": {},

      "required": [

        "endpoint"

      ]

    },

    "EntityInfo": {

      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/EntityInfo"

    },

    "GeoQuery": {

      "type": "object",

      "required": [
@@ -121,6 +121,9 @@ 
    "@context": {

      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/LdContext"

    },

    "entities": {

      "$ref": "#/definitions/EntityInfo"

    },

    "name": {

      "type": "string",

      "minLength": 1
@@ -129,8 +132,8 @@ 
      "type": "string",

      "minLength": 1

    },

      "entities": {

        "$ref": "#/definitions/EntityInfo"

    "notification": {

      "$ref": "#/definitions/NotificationParams"

    },

    "watchedAttributes": {

      "type": "array",
@@ -144,12 +147,6 @@ 
      "type": "number",

      "minimum": 0

    },

      "geoQ": {

        "$ref": "#/definitions/GeoQuery"

      },

      "notification": {

        "$ref": "#/definitions/NotificationParams"

      },

    "expires": {

      "type": "string",

      "format": "date-time"
@@ -181,4 +178,3 @@ 
    "type"

  ]

}
 
}

schema/common.json

+37 −0
Original line number Diff line number Diff line
@@ -61,6 +61,43 @@ 
          ]

        }

      }

    },

    "EntityInfo": {

      "anyOf": [

        {

          "type": "object",

          "required": [

            "id"

          ],

          "properties": {

            "id": {

              "type": "string"

            }

          }

        },

        {

          "type": "object",

          "required": [

            "idPattern"

          ],

          "properties": {

            "idPattern": {

              "type": "string"

            }

          }

        },

        {

          "type": "object",

          "required": [

            "type"

          ],

          "properties": {

            "type": {

              "type": "string"

            }

          }

        }

      ]

    }

  }

}