SOL009 NFV MANO Configuration and Information Management - Implementation of deltas between v3.5.1 and v3.3.1

This merge request refers to the implementation of deltas between v3.5.1 and v3.3.1 of SOL009 NFV MANO Configuration and Information Management.

@lynchpi @aelken @matsuurat @sayama @kraja @zafar @muhammadh @abbasim

Deadline for review: Monday 1st November 2021 @6pm CEST

Review period elapsed: Approved !

Edited by Giacomo Bernini

Merge request reports

Loading
+0 −20940

File deleted.

Preview size limit exceeded, changes collapsed.

+10 −9
Changes for SOL009/NFVManoConfigurationAndInformationManagement-API/environment/variables.txt: 10 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -3,22 +3,22 @@ ${NFVMANOHOST} localhost
${NFVMANO_PORT}      8080    
${NFVMANO_SCHEMA}    https

${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
${NEG_AUTHORIZATION}    Bearer negativetoken
${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
${BAD_AUTHORIZATION}    Bear sometoken
${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
${NEG_AUTHORIZATION_TOKEN}    Bearer negativetoken

${BAD_AUTHORIZATION_TOKEN}    Bear sometoken

${CONTENT_TYPE_JSON}    application/json
${ACCEPT_JSON}    application/json
${CONTENT_TYPE_PATCH}    application/merge-patch+json
${AUTH_USAGE}     1
${FIELD_USAGE}    1

${NFVMANO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint

${NFVMANO_ALLOWS_DUPLICATE_SUBS}    1


${apiRoot}        /
${apiMajorVersion}     v1
${apiMajorVersion}     v2
${apiName}        nfvmanocim

${response}    
@@ -36,12 +36,13 @@ ${peerEntityId}

${callback_port}    9091
${callback_uri}    http://172.22.1.7:${callback_port}
${unreachable_callback_uri}   http://unreachable_callback_uri-error-code-422
${callback_endpoint}    /subscriptions
${filter_ok}      callbackUri=${callbackUri}
${filter_ko}      erroneousFilter=erroneous
${callback_endpoint_fwd}    /endpoint/check
${callback_endpoint_error}    /subs_404
${sleep_interval}    20s



${total_polling_time}   2 min
${polling_interval}     10 sec
+0 −151
Changes for SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ChangeStateNotification.json: 0 added lines, 151 removed lines.
Original line number Diff line number Diff line
{
    "description": "This type represents a Change state operation occurrence.\n",
    "type": "object",
    "properties": {
      "id": {
        "description": "An identifier with the intention of being globally unique.\n",
        "type": "string"
      },
      "notificationType": {
        "description": "Discriminator for the different notification types. Shall be set to \"ChangeStateNotification\" for this notification type.\n",
        "type": "string"
      },
      "subscriptionId": {
        "description": "An identifier with the intention of being globally unique.\n",
        "type": "string"
      },
      "timestamp": {
        "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
        "type": "string",
        "format": "date-time"
      },
      "changeStateOpOccId": {
        "description": "An identifier with the intention of being globally unique.\n",
        "type": "string"
      },
      "stateChangedTime": {
        "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
        "type": "string",
        "format": "date-time"
      },
      "changeStateOperationState": {
        "description": "The enumeration ChangeStateOpOccStateEnumType defines permitted values for the change state operation. It shall comply with the provisions :\n  - PROCESSING\tThe change state operation is currently in execution.\n  - COMPLETED\tThe change state operation has been completed successfully.\n  - FAILED\tThe change state operation has failed.\n",
        "type": "string",
        "enum": [
          "PROCESSING",
          "COMPLETED",
          "FAILED"
        ]
      },
      "managedObjectRef": {
        "description": "This type represents the identifier to reference a managed object of a  particular type. \n",
        "type": "object",
        "properties": {
          "type": {
            "description": "Indicates the type of managed object. Permitted values:\n  - MANO_ENTITY\n  - MANO_SERVICE\n  - MANO_SERVICE_IF\n  - CONSUMED_MANO_IF\n  - MANO_ENTITY_COMPONENT\n\nThe \"MANO_ENTITY COMPONENT\" is only applicable if attribute \"manoEntityComponents\" in \"ManoEntity\" is supported by the API producer.\n",
            "type": "string",
            "enum": [
              "MANO_ENTITY",
              "MANO_SERVICE",
              "MANO_SERVICE_IF",
              "CONSUMED_MANO_IF",
              "MANO_ENTITY_COMPONENT"
            ]
          },
          "objectId": {
            "description": "An identifier with the intention of being globally unique.\n",
            "type": "string"
          },
          "subObjectId": {
            "description": "An identifier that is unique for the respective type within a NFV-MANO functional entity, but that need not be globally unique. Representation: string of variable length..\n",
            "type": "string"
          }
        },
        "required": [
          "type",
          "objectId"
        ]
      },
      "operationalState": {
        "description": "The enumeration OperationalStateEnumType defines values representing the operational state of an NFV-MANO functional application type of managed entity. The OperationalStateEnumType shall comply with the provisions:\n  - STARTED\tThe managed entity is operational.\n  - STOPPED\tThe managed entity is not operational.\n  - STOPPING\tThe managed entity is in the transition to stop.\n  - STARTING\tThe managed entity is in the transition to start and become operational.\n  - RESTARTING\tThe managed entity is in the transition to stop and start again.\n",
        "type": "string",
        "enum": [
          "STARTED",
          "STOPPED",
          "STOPPING",
          "STARTING",
          "RESTARTING"
        ]
      },
      "administrativeState": {
        "description": "The enumeration AdministrativeStateEnumType defines values representing the administrative state of a managed entity. The AdministrativeStateEnumType shall comply with the provisions:\n  - LOCKED\tThe managed entity is administratively prohibited to be used.\n  - UNLOCKED\tThe managed entity is administratively allowed to be used.\n  - LOCKING\tThe managed entity is in the transition to be locked.\n",
        "type": "string",
        "enum": [
          "LOCKED",
          "UNLOCKED",
          "LOCKING"
        ]
      },
      "_links": {
        "description": "Links to resources related to this notification.\n",
        "type": "object",
        "properties": {
          "subscription": {
            "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
            "type": "object",
            "required": [
              "href"
            ],
            "properties": {
              "href": {
                "description": "String formatted according to IETF RFC 3986.\n",
                "type": "string"
              }
            }
          },
          "objectInstance": {
            "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
            "type": "object",
            "required": [
              "href"
            ],
            "properties": {
              "href": {
                "description": "String formatted according to IETF RFC 3986.\n",
                "type": "string"
              }
            }
          },
          "changeStateOpOcc": {
            "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
            "type": "object",
            "required": [
              "href"
            ],
            "properties": {
              "href": {
                "description": "String formatted according to IETF RFC 3986.\n",
                "type": "string"
              }
            }
          }
        },
        "required": [
          "subscription",
          "objectInstance",
          "changeStateOpOcc"
        ]
      }
    },
    "required": [
      "id",
      "notificationType",
      "subscriptionId",
      "timestamp",
      "changeStateOpOccId",
      "stateChangedTime",
      "changeStateOperationState",
      "managedObjectRef",
      "_links"
    ]
  }
 No newline at end of file
+151 −0
Changes for SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ChangeStateNotification.schema.json: 151 added lines, 0 removed lines.
Original line number Diff line number Diff line
{
  "description": "This type represents a Change state operation occurrence.\n",
  "type": "object",
  "required": [
    "id",
    "notificationType",
    "subscriptionId",
    "timestamp",
    "changeStateOpOccId",
    "stateChangedTime",
    "changeStateOperationState",
    "managedObjectRef",
    "_links"
  ],
  "properties": {
    "id": {
      "description": "An identifier with the intention of being globally unique.\n",
      "type": "string"
    },
    "notificationType": {
      "description": "Discriminator for the different notification types. Shall be set to \"ChangeStateNotification\" for this notification type.\n",
      "type": "string"
    },
    "subscriptionId": {
      "description": "An identifier with the intention of being globally unique.\n",
      "type": "string"
    },
    "timestamp": {
      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
      "type": "string",
      "format": "date-time"
    },
    "changeStateOpOccId": {
      "description": "An identifier with the intention of being globally unique.\n",
      "type": "string"
    },
    "stateChangedTime": {
      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
      "type": "string",
      "format": "date-time"
    },
    "changeStateOperationState": {
      "description": "The enumeration ChangeStateOpOccStateEnumType defines permitted values for the change state operation. It shall comply with the provisions :\n  - PROCESSING\tThe change state operation is currently in execution.\n  - COMPLETED\tThe change state operation has been completed successfully.\n  - FAILED\tThe change state operation has failed.\n",
      "type": "string",
      "enum": [
        "PROCESSING",
        "COMPLETED",
        "FAILED"
      ]
    },
    "managedObjectRef": {
      "description": "This type represents the identifier to reference a managed object of a  particular type. \n",
      "type": "object",
      "properties": {
        "type": {
          "description": "Indicates the type of managed object. Permitted values:\n  - MANO_ENTITY\n  - MANO_SERVICE\n  - MANO_SERVICE_IF\n  - CONSUMED_MANO_IF\n  - MANO_ENTITY_COMPONENT\n\nThe \"MANO_ENTITY COMPONENT\" is only applicable if attribute \"manoEntityComponents\" in \"ManoEntity\" is supported by the API producer.\n",
          "type": "string",
          "enum": [
            "MANO_ENTITY",
            "MANO_SERVICE",
            "MANO_SERVICE_IF",
            "CONSUMED_MANO_IF",
            "MANO_ENTITY_COMPONENT"
          ]
        },
        "objectId": {
          "description": "An identifier with the intention of being globally unique.\n",
          "type": "string"
        },
        "subObjectId": {
          "description": "An identifier that is unique for the respective type within a NFV-MANO functional entity, but that need not be globally unique. Representation: string of variable length..\n",
          "type": "string"
        }
      },
      "required": [
        "type",
        "objectId"
      ]
    },
    "operationalState": {
      "description": "The enumeration OperationalStateEnumType defines values representing the operational state of an NFV-MANO functional application type of managed entity. The OperationalStateEnumType shall comply with the provisions:\n  - STARTED\tThe managed entity is operational.\n  - STOPPED\tThe managed entity is not operational.\n  - STOPPING\tThe managed entity is in the transition to stop.\n  - STARTING\tThe managed entity is in the transition to start and become operational.\n  - RESTARTING\tThe managed entity is in the transition to stop and start again.\n",
      "type": "string",
      "enum": [
        "STARTED",
        "STOPPED",
        "STOPPING",
        "STARTING",
        "RESTARTING"
      ]
    },
    "administrativeState": {
      "description": "The enumeration AdministrativeStateEnumType defines values representing the administrative state of a managed entity. The AdministrativeStateEnumType shall comply with the provisions:\n  - LOCKED\tThe managed entity is administratively prohibited to be used.\n  - UNLOCKED\tThe managed entity is administratively allowed to be used.\n  - LOCKING\tThe managed entity is in the transition to be locked.\n",
      "type": "string",
      "enum": [
        "LOCKED",
        "UNLOCKED",
        "LOCKING"
      ]
    },
    "_links": {
      "description": "Links to resources related to this notification.\n",
      "type": "object",
      "properties": {
        "subscription": {
          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
          "type": "object",
          "required": [
            "href"
          ],
          "properties": {
            "href": {
              "description": "String formatted according to IETF RFC 3986.\n",
              "type": "string"
            }
          }
        },
        "objectInstance": {
          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
          "type": "object",
          "required": [
            "href"
          ],
          "properties": {
            "href": {
              "description": "String formatted according to IETF RFC 3986.\n",
              "type": "string"
            }
          }
        },
        "changeStateOpOcc": {
          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
          "type": "object",
          "required": [
            "href"
          ],
          "properties": {
            "href": {
              "description": "String formatted according to IETF RFC 3986.\n",
              "type": "string"
            }
          }
        }
      },
      "required": [
        "subscription",
        "objectInstance",
        "changeStateOpOcc"
      ]
    }
  }
}
 No newline at end of file
+85 −0
Changes for SOL009/NFVManoConfigurationAndInformationManagement-API/schemas/ChangeStateOpOcc.schema.json: 85 added lines, 0 removed lines.
Original line number Diff line number Diff line
{
  "description": "This type represents a Change state operation occurrence. \n",
  "type": "object",
  "required": [
    "id",
    "operationState",
    "stateEnteredTime",
    "startTime",
    "managedObjectRef"
  ],
  "properties": {
    "id": {
      "description": "An identifier with the intention of being globally unique.\n",
      "type": "string"
    },
    "operationState": {
      "description": "The enumeration ChangeStateOpOccStateEnumType defines permitted values for the change state operation. It shall comply with the provisions :\n  - PROCESSING\tThe change state operation is currently in execution.\n  - COMPLETED\tThe change state operation has been completed successfully.\n  - FAILED\tThe change state operation has failed.\n",
      "type": "string",
      "enum": [
        "PROCESSING",
        "COMPLETED",
        "FAILED"
      ]
    },
    "stateEnteredTime": {
      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
      "type": "string",
      "format": "date-time"
    },
    "startTime": {
      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
      "type": "string",
      "format": "date-time"
    },
    "managedObjectRef": {
      "description": "This type represents the identifier to reference a managed object of a  particular type. \n",
      "type": "object",
      "properties": {
        "type": {
          "description": "Indicates the type of managed object. Permitted values:\n  - MANO_ENTITY\n  - MANO_SERVICE\n  - MANO_SERVICE_IF\n  - CONSUMED_MANO_IF\n  - MANO_ENTITY_COMPONENT\n\nThe \"MANO_ENTITY COMPONENT\" is only applicable if attribute \"manoEntityComponents\" in \"ManoEntity\" is supported by the API producer.\n",
          "type": "string",
          "enum": [
            "MANO_ENTITY",
            "MANO_SERVICE",
            "MANO_SERVICE_IF",
            "CONSUMED_MANO_IF",
            "MANO_ENTITY_COMPONENT"
          ]
        },
        "objectId": {
          "description": "An identifier with the intention of being globally unique.\n",
          "type": "string"
        },
        "subObjectId": {
          "description": "An identifier that is unique for the respective type within a NFV-MANO functional entity, but that need not be globally unique. Representation: string of variable length..\n",
          "type": "string"
        }
      },
      "required": [
        "type",
        "objectId"
      ]
    },
    "changeOperationalStateRequest": {
      "description": "The enumeration ChangeOperationalStateEnumType defines permitted values  for the change state operation.  The ChangeOperationalStateEnumType shall comply with the provisions:\n  - START\tTo start the managed entity.\n  - STOP\tTo stop the managed entity.\n  - RESTART\tTo stop and start again the managed entity.\n",
      "type": "string",
      "enum": [
        "START",
        "STOP",
        "RESTART"
      ]
    },
    "changeAdministrativeStateRequest": {
      "description": "The enumeration ChangeAdministrativeStateEnumType defines permitted values  for the change of administrative state operation.  The ChangeAdministrativeStateEnumType shall comply with the provisions:\n  - LOCK\tTo lock the managed entity.\n  - UNLOCK\tTo unlock the managed entity.\n",
      "type": "string",
      "enum": [
        "LOCK",
        "UNLOCK"
      ]
    },
    "operationParams": {
      "description": "Input parameters of the change state operation. This attribute shall be  formatted according to the request data type of the related change state  operation. \nThe following mapping between operationType and the data type of this  attribute shall apply:\n  - CHANGE_STATE: ChangeStateRequest\n  \nThis attribute shall be present if this data type is returned in a response  to reading an individual resource, and may be present according to the chosen  attribute selector parameter if this data type is returned in a response to  a query of a container resource.\n"
    }
  }
}
 No newline at end of file
Loading
Loading