diff --git a/spec/ApplicationPattern+config.json b/spec/ApplicationPattern+config.json index 4a8f2d63..b9d47adc 100644 --- a/spec/ApplicationPattern+config.json +++ b/spec/ApplicationPattern+config.json @@ -544,7 +544,7 @@ }, "operation-server-interface-configuration": { "life-cycle-state": "operation-server-interface-1-0:LIFE_CYCLE_STATE_TYPE_EXPERIMENTAL", - "operation-key": "Operation key not yet provided." + "operation-key": "n.a." } } } @@ -1691,7 +1691,7 @@ "uuid": "xx-1-0-0-op-fd-000", "forwarding-construct": [ { - "uuid": "xx-1-0-0-op-fc-bm-000", + "uuid": "xx-1-0-0-op-fc-bm-999", "name": [ { "value-name": "ForwardingKind", @@ -1720,6 +1720,36 @@ } ] }, + { + "uuid": "xx-1-0-0-op-fc-bm-000", + "name": [ + { + "value-name": "ForwardingKind", + "value": "core-model-1-4:FORWARDING_KIND_TYPE_INVARIANT_PROCESS_SNIPPET" + }, + { + "value-name": "ForwardingName", + "value": "PromptForRegisteringCausesRegistrationRequest2" + } + ], + "fc-port": [ + { + "local-id": "000", + "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_MANAGEMENT", + "logical-termination-point": "xx-1-0-0-op-s-bm-000" + }, + { + "local-id": "100", + "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_INPUT", + "logical-termination-point": "xx-1-0-0-op-s-bm-000" + }, + { + "local-id": "200", + "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_OUTPUT", + "logical-termination-point": "xx-1-0-0-op-c-bm-ro-2-1-0-000" + } + ] + }, { "uuid": "xx-1-0-0-op-fc-bm-001", "name": [ @@ -1823,6 +1853,21 @@ "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_INPUT", "logical-termination-point": "xx-1-0-0-op-s-bm-012" }, + { + "local-id": "113", + "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_INPUT", + "logical-termination-point": "xx-1-0-0-op-s-bm-013" + }, + { + "local-id": "114", + "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_INPUT", + "logical-termination-point": "xx-1-0-0-op-s-bm-014" + }, + { + "local-id": "115", + "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_INPUT", + "logical-termination-point": "xx-1-0-0-op-s-bm-015" + }, { "local-id": "130", "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_INPUT", @@ -2073,6 +2118,11 @@ "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_INPUT", "logical-termination-point": "xx-1-0-0-op-s-bm-012" }, + { + "local-id": "115", + "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_INPUT", + "logical-termination-point": "xx-1-0-0-op-s-bm-015" + }, { "local-id": "130", "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_INPUT", diff --git a/spec/ApplicationPattern+forwardings.yaml b/spec/ApplicationPattern+forwardings.yaml index a20f8f2c..c58b6d68 100644 --- a/spec/ApplicationPattern+forwardings.yaml +++ b/spec/ApplicationPattern+forwardings.yaml @@ -1,6 +1,25 @@ forwardings: - forwarding-name: PromptForRegisteringCausesRegistrationRequest + uuid: xx-1-0-0-op-fc-bm-999 + forwarding-type: InvariantProcessSnippet + management-requests: + operation-client-update: + - server-name: /v1/register-yourself + uuid: xx-1-0-0-op-s-bm-000 + fc-port-update: + - server-name: /v1/register-yourself + uuid: xx-1-0-0-op-s-bm-000 + fc-port-deletion: + operation-client-deletion: + initiating-requests: + - server-name: /v1/register-yourself + uuid: xx-1-0-0-op-s-bm-000 + consequent-requests: + - client-name: RegistryOffice://v2/register-application + uuid: xx-1-0-0-op-c-bm-ro-2-1-0-000 + + - forwarding-name: PromptForRegisteringCausesRegistrationRequest2 uuid: xx-1-0-0-op-fc-bm-000 forwarding-type: InvariantProcessSnippet management-requests: @@ -71,6 +90,12 @@ forwardings: uuid: xx-1-0-0-op-s-bm-011 - server-name: /v1/inquire-basic-auth-approvals uuid: xx-1-0-0-op-s-bm-012 + - server-name: /v1/dispose-remainders-of-deregistered-application + uuid: xx-1-0-0-op-s-bm-013 + - server-name: /v1/inform-about-preceding-release + uuid: xx-1-0-0-op-s-bm-014 + - server-name: /v1/update-client-of-subsequent-release + uuid: xx-1-0-0-op-s-bm-015 - server-name: /v1/bequeath-your-data-and-die uuid: xx-1-0-0-op-s-im-000 - server-name: /v1/start-application-in-generic-representation @@ -226,6 +251,8 @@ forwardings: uuid: xx-1-0-0-op-s-bm-011 - server-name: /v1/inquire-basic-auth-approvals uuid: xx-1-0-0-op-s-bm-012 + - server-name: /v1/update-client-of-subsequent-release + uuid: xx-1-0-0-op-s-bm-015 - server-name: /v1/bequeath-your-data-and-die uuid: xx-1-0-0-op-s-im-000 ## TODO: All INDIVIDUAL service requests, which are updating an LTP, to be complemented diff --git a/spec/ApplicationPattern.yaml b/spec/ApplicationPattern.yaml index 57334f6c..1e915ec0 100644 --- a/spec/ApplicationPattern.yaml +++ b/spec/ApplicationPattern.yaml @@ -792,6 +792,16 @@ paths: application/json: schema: type: object + required: + - application-name + - release-number + - embedding-operation + - client-update-operation + - operation-client-update-operation + - dispose-remainders-operation + - preceding-release-operation + - subsequent-release-operation + - tcp-server properties: application-name: type: string @@ -1941,6 +1951,12 @@ paths: application/json: schema: type: object + required: + - Authorization + - application-name + - release-number + - operation-name + - method properties: Authorization: type: string @@ -1975,16 +1991,28 @@ paths: content: application/json: schema: - type: object - properties: - basic-auth-request-is-approved: - type: boolean - description: 'If true, BasicAuth request can be executed' - reason-of-objection: - type: string - description: > - 'if AUTHORIZATION_CODE_UNKNOWN BasicAuth request to be aborted and 401 to be sent - else BasicAuth request to be aborted and 403 to be sent' + oneOf: + - description: 'AdministratorAdministration is responding' + type: object + properties: + oam-request-is-approved: + type: boolean + reason-of-objection: + type: string + description: > + 'This attribute to be represented, if response::oam-request-is-approved==false. + Reasons to be checked and indicated according to the sequence defined in the enumeration.' + - description: 'AccessAdministration is responding' + type: object + properties: + basic-auth-request-is-approved: + type: boolean + description: 'If true, BasicAuth request can be executed' + reason-of-objection: + type: string + description: > + 'if AUTHORIZATION_CODE_UNKNOWN BasicAuth request to be aborted and 401 to be sent + else BasicAuth request to be aborted and 403 to be sent' headers: x-correlator: schema: @@ -3631,6 +3659,12 @@ paths: application/json: schema: type: object + required: + - Authorization + - application-name + - release-number + - operation-name + - method properties: Authorization: type: string @@ -3805,8 +3839,6 @@ paths: summary: 'Provides name and number of the preceding release' tags: - BasicServices - security: - - apiKeyAuth: [] responses: '200': description: 'Name and number of the preceding release provided' @@ -3938,7 +3970,7 @@ paths: description: > 'Domain name to be used during the bequeath-your-data-and-die process update [/core-model-1-4:control-construct/logical-termination-point=xx-1-0-0-tcp-c-nr-1-0-0-000/layer-protocol=0/tcp-client-interface-1-0:tcp-client-interface-pac/tcp-client-interface-configuration/remote-address/domain-name]' - future-port: + port: type: integer minimum: 0 maximum: 65535 diff --git a/spec/README.md b/spec/README.md index c84bc68f..f14e3a41 100644 --- a/spec/README.md +++ b/spec/README.md @@ -1,5 +1,8 @@ # ApplicationPattern Specification +### Diagrams +- [Collection of Diagrams](./diagrams) + ### ServiceList - [ApplicationPattern+services](./ApplicationPattern+services.yaml) diff --git a/spec/diagrams/README.md b/spec/diagrams/README.md new file mode 100644 index 00000000..f12335e0 --- /dev/null +++ b/spec/diagrams/README.md @@ -0,0 +1,24 @@ +# ApplicationPattern Diagrams +. +. +![No Callback](./bm013_DisposeRemainders.png) +. +. +## System Scope +. +. +![regardApplication](./systemScope/001_Registering.png) +. +. +![disregardApplication](./systemScope/010_Embedding.png) +. +. +![listApplications](./systemScope/011_EmbedWithAlt.png) +. +. +![approveOamRequest](./systemScope/013_EmbedWithEatl.png) +. +. +![approveBasicAuthRequest](./systemScope/017_EmbedWithOkm.png) +. +. \ No newline at end of file diff --git a/spec/diagrams/systemScope/EmbedNewApp.png b/spec/diagrams/systemScope/EmbedNewApp.png deleted file mode 100644 index 9802bbb1..00000000 Binary files a/spec/diagrams/systemScope/EmbedNewApp.png and /dev/null differ diff --git a/spec/diagrams/systemScope/Improved_EmbedNewApp.png b/spec/diagrams/systemScope/Improved_EmbedNewApp.png deleted file mode 100644 index 4e905c7a..00000000 Binary files a/spec/diagrams/systemScope/Improved_EmbedNewApp.png and /dev/null differ diff --git a/spec/diagrams/systemScope/old_EmbedNewApp.plantuml b/spec/diagrams/systemScope/old_EmbedNewApp.plantuml index 256e0b3a..34666398 100644 --- a/spec/diagrams/systemScope/old_EmbedNewApp.plantuml +++ b/spec/diagrams/systemScope/old_EmbedNewApp.plantuml @@ -1,4 +1,4 @@ -@startuml EmbedNewApp +@startuml old_EmbedNewApp skinparam responseMessageBelowArrow true title diff --git a/spec/diagrams/systemScope/old_Improved_EmbedNewApp.plantuml b/spec/diagrams/systemScope/old_Improved_EmbedNewApp.plantuml index 6ef8df4d..d41fd78e 100644 --- a/spec/diagrams/systemScope/old_Improved_EmbedNewApp.plantuml +++ b/spec/diagrams/systemScope/old_Improved_EmbedNewApp.plantuml @@ -1,4 +1,4 @@ -@startuml Improved_EmbedNewApp +@startuml old_Improved_EmbedNewApp skinparam responseMessageBelowArrow true title