From 3fa38e2977fa6a9ee0f69eb6e7d925767d79a713 Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Fri, 23 Aug 2024 12:51:38 +0200
Subject: [PATCH 01/16] Set version numbers in YAML files
---
code/API_definitions/qod-provisioning.yaml | 6 +++---
code/API_definitions/qos-profiles.yaml | 6 +++---
code/API_definitions/quality-on-demand.yaml | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/code/API_definitions/qod-provisioning.yaml b/code/API_definitions/qod-provisioning.yaml
index 19c749bb77..7fbc010050 100644
--- a/code/API_definitions/qod-provisioning.yaml
+++ b/code/API_definitions/qod-provisioning.yaml
@@ -60,15 +60,15 @@ info:
license:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html
- version: wip
- x-camara-commonalities: 0.4.0-rc.1
+ version: 0.1.0
+ x-camara-commonalities: 0.4.0
externalDocs:
description: Project documentation at CAMARA
url: https://github.com/camaraproject/QualityOnDemand
servers:
- - url: "{apiRoot}/qod-provisioning/vwip"
+ - url: "{apiRoot}/qod-provisioning/v0.1"
variables:
apiRoot:
default: http://localhost:9091
diff --git a/code/API_definitions/qos-profiles.yaml b/code/API_definitions/qos-profiles.yaml
index 9ae2132ce0..03b992c173 100644
--- a/code/API_definitions/qos-profiles.yaml
+++ b/code/API_definitions/qos-profiles.yaml
@@ -55,8 +55,8 @@ info:
license:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html
- version: wip
- x-camara-commonalities: 0.4.0-rc.1
+ version: 0.11.0
+ x-camara-commonalities: 0.4.0
externalDocs:
@@ -64,7 +64,7 @@ externalDocs:
url: https://github.com/camaraproject/QualityOnDemand
servers:
- - url: "{apiRoot}/qos-profiles/vwip"
+ - url: "{apiRoot}/qos-profiles/v0.11"
variables:
apiRoot:
default: http://localhost:9091
diff --git a/code/API_definitions/quality-on-demand.yaml b/code/API_definitions/quality-on-demand.yaml
index 722e43f538..5e1821ebf0 100644
--- a/code/API_definitions/quality-on-demand.yaml
+++ b/code/API_definitions/quality-on-demand.yaml
@@ -95,15 +95,15 @@ info:
license:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html
- version: wip
- x-camara-commonalities: 0.4.0-rc.1
+ version: 0.11.0
+ x-camara-commonalities: 0.4.0
externalDocs:
description: Project documentation at Camara
url: https://github.com/camaraproject/QualityOnDemand
servers:
- - url: "{apiRoot}/quality-on-demand/vwip"
+ - url: "{apiRoot}/quality-on-demand/v0.11"
variables:
apiRoot:
default: http://localhost:9091
From 9aa37df6f5667f35cdb846f49a93538820f6c697 Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Fri, 23 Aug 2024 12:52:31 +0200
Subject: [PATCH 02/16] Update of API Readiness checklists
Target state for M4 assumed
---
...od-provisioning-API-Readiness-Checklist.md | 25 +++++++++++++------
.../qos-profiles-API-Readiness-Checklist.md | 16 ++++++------
...ality-on-demand-API-Readiness-Checklist.md | 12 ++++-----
3 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/documentation/API_documentation/qod-provisioning-API-Readiness-Checklist.md b/documentation/API_documentation/qod-provisioning-API-Readiness-Checklist.md
index 766d8c8924..3645a7b445 100644
--- a/documentation/API_documentation/qod-provisioning-API-Readiness-Checklist.md
+++ b/documentation/API_documentation/qod-provisioning-API-Readiness-Checklist.md
@@ -1,18 +1,27 @@
# API Readiness Checklist
-Checklist for qod-provisioning v0.1.0-rc.1 in r1.1
+Checklist for qod-provisioning v0.1.0 in r1.2
| Nr | API release assets | alpha | release-candidate | initial
public | stable
public | Status | Comments |
|----|----------------------------------------------|:-----:|:-----------------:|:-------:|:------:|:----:|------|
-| 1 | API definition | M | M | M | M | Y | /code/API_definitions/qod-provisioning.yaml |
+| 1 | API definition | M | M | M | M | Y | [/code/API_definitions/qod-provisioning.yaml](/code/API_definitions/qod-provisioning.yaml) |
| 2 | Design guidelines from Commonalities applied | O | M | M | M | Y | |
| 3 | Guidelines from ICM applied | O | M | M | M | Y | |
| 4 | API versioning convention applied | M | M | M | M | Y | |
| 5 | API documentation | M | M | M | M | Y | inline in YAML |
-| 6 | User stories | O | O | O | M | N/A | |
-| 7 | Basic API test cases & documentation | O | M | M | M | tbd | |
-| 8 | Enhanced API test cases & documentation | O | O | O | M | N/A | |
-| 9 | Test result statement | O | O | O | M | N/A | |
+| 6 | User stories | O | O | O | M | N | |
+| 7 | Basic API test cases & documentation | O | M | M | M | Y | [/code/Test_definitions](/code/Test_definitions) |
+| 8 | Enhanced API test cases & documentation | O | O | O | M | N | |
+| 9 | Test result statement | O | O | O | M | N | |
| 10 | API release numbering convention applied | M | M | M | M | Y | |
-| 11 | Change log updated | M | M | M | M | tbd | /CHANGELOG.md |
-| 12 | Previous public release was certified | O | O | O | M | N/A | |
+| 11 | Change log updated | M | M | M | M | Y | [/CHANGELOG.md](/CHANGELOG.md) |
+| 12 | Previous public release was certified | O | O | O | M | N | |
+
+To fill the checklist:
+- in the line above the table, replace the api-name, api-version and the rx.y by their actual values for the current API version and release.
+- in the Status column, put "Y" (yes) if the release asset is available or fulfilled in the current release, a "N" (no) or a "tbd". Example use of "tbd" is in case an alpha or release-candidate API version does not yet provide all mandatory assets for the release.
+- in the Comments column, provide the link to the asset once available, and any other relevant comments.
+
+Note: the checklists of a public API version and of its preceding release-candidate API version can be the same.
+
+The documentation for the content of the checklist is here: [API Readiness Checklist](https://wiki.camaraproject.org/x/AgAVAQ)
\ No newline at end of file
diff --git a/documentation/API_documentation/qos-profiles-API-Readiness-Checklist.md b/documentation/API_documentation/qos-profiles-API-Readiness-Checklist.md
index 9470870da0..370b773496 100644
--- a/documentation/API_documentation/qos-profiles-API-Readiness-Checklist.md
+++ b/documentation/API_documentation/qos-profiles-API-Readiness-Checklist.md
@@ -1,20 +1,20 @@
# API Readiness Checklist
-Checklist for qos-profiles v0.11.0-rc.1 in r1.1
+Checklist for qos-profiles v0.11.0 in r1.2
| Nr | API release assets | alpha | release-candidate | initial
public | stable
public | Status | Comments |
|----|----------------------------------------------|:-----:|:-----------------:|:-------:|:------:|:----:|----|
-| 1 | API definition | M | M | M | M | Y | /code/API_definitions/qos-profiles.yaml |
-| 2 | Design guidelines from Commonalities applied | O | M | M | M | Y | |
+| 1 | API definition | M | M | M | M | Y | [/code/API_definitions/qos-profiles.yaml](/code/API_definitions/qos-profiles.yaml) |
+| 2 | Design guidelines from Commonalities applied | O | M | M | M | Y | |
| 3 | Guidelines from ICM applied | O | M | M | M | Y | |
| 4 | API versioning convention applied | M | M | M | M | Y | |
| 5 | API documentation | M | M | M | M | Y | inline within YAML |
-| 6 | User stories | O | O | O | M | N | link |
-| 7 | Basic API test cases & documentation | O | M | M | M | tbd | link |
-| 8 | Enhanced API test cases & documentation | O | O | O | M | N | link |
-| 9 | Test result statement | O | O | O | M | N | link |
+| 6 | User stories | O | O | O | M | N | |
+| 7 | Basic API test cases & documentation | O | M | M | M | Y | [/code/Test_definitions](/code/Test_definitions) |
+| 8 | Enhanced API test cases & documentation | O | O | O | M | N | |
+| 9 | Test result statement | O | O | O | M | N | |
| 10 | API release numbering convention applied | M | M | M | M | Y | |
-| 11 | Change log updated | M | M | M | M | Y | /CHANGELOG.md |
+| 11 | Change log updated | M | M | M | M | Y | [/CHANGELOG.md](/CHANGELOG.md) |
| 12 | Previous public release was certified | O | O | O | M | N | |
To fill the checklist:
diff --git a/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md b/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md
index 2d29c81b0c..ee935abfff 100644
--- a/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md
+++ b/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md
@@ -1,20 +1,20 @@
# API Readiness Checklist
-Checklist for quality-on-demand v0.11.0-rc.1 in r1.1
+Checklist for quality-on-demand v0.11.0 in r1.2
| Nr | API release assets | alpha | release-candidate | initial
public | stable
public | Status | Comments |
|----|----------------------------------------------|:-----:|:-----------------:|:-------:|:------:|:----:|----|
-| 1 | API definition | M | M | M | M | Y | /code/API_definitions/quality-on-demand.yaml |
+| 1 | API definition | M | M | M | M | Y | [/code/API_definitions/quality-on-demand.yaml](/code/API_definitions/quality-on-demand.yaml) |
| 2 | Design guidelines from Commonalities applied | O | M | M | M | Y | |
| 3 | Guidelines from ICM applied | O | M | M | M | Y | |
| 4 | API versioning convention applied | M | M | M | M | Y | |
| 5 | API documentation | M | M | M | M | Y | inline in YAML |
-| 6 | User stories | O | O | O | M | tbd | /documentation/API_documentation/QoD_User_Story.md (review/update tbd) |
-| 7 | Basic API test cases & documentation | O | M | M | M | tbd | /code/Test_definitions/QoD_API_Test.feature (update tbd) |
-| 8 | Enhanced API test cases & documentation | O | O | O | M | N | link |
+| 6 | User stories | O | O | O | M | Y | [/documentation/API_documentation/QoD_User_Story.md](/documentation/API_documentation/QoD_User_Story.md) |
+| 7 | Basic API test cases & documentation | O | M | M | M | Y | [/code/Test_definitions](/code/Test_definitions) |
+| 8 | Enhanced API test cases & documentation | O | O | O | M | N | |
| 9 | Test result statement | O | O | O | M | N | |
| 10 | API release numbering convention applied | M | M | M | M | Y | |
-| 11 | Change log updated | M | M | M | M | Y | /CHANGELOG.md |
+| 11 | Change log updated | M | M | M | M | Y | [/CHANGELOG.md](/CHANGELOG.md) |
| 12 | Previous public release was certified | O | O | O | M | ? | |
To fill the checklist:
From 6289a84cb3896f10b17dcfcb143998b887cc7d43 Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Fri, 23 Aug 2024 13:28:30 +0200
Subject: [PATCH 03/16] Update CHANGELOG.md
Release notes for r1.2 including:
Editorial changes or some entries from r1.1
Added PR #335 which was missed to be mentioned in r1.1
---
CHANGELOG.md | 105 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 102 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index acfd95c3a4..d4df8de410 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
# Changelog QualityOnDemand
## Table of Contents
-- **[r1.1](#r11)**
+- [r1.2](#r12)
+- [r1.1](#r11)
- [v0.10.1](#v0101)
- [v0.10.0](#v0100)
- [v0.10.0-rc2](#v0100-rc2)
@@ -12,13 +13,111 @@
- [v0.8.0](#v080)
- [v0.1.0 - Initial contribution](#v010---initial-contribution)
-Version numbers 0.2.x to 0.7.x were intentionally not used to avoid conflicts with local implementations.
-
**Please be aware that the project will have frequent updates to the main branch. There are no compatibility guarantees associated with code in any branch, including main, until it has been released. For example, changes may be reverted before a release is published. For the best results, use the latest published release.**
# r1.1
## Release Notes
+This public release contains the definition and documentation of
+* quality-on-demand v0.11.0
+* qos-profiles v0.11.0
+* qod-provisioning v0.1.0
+
+The API definition(s) are based on
+* Commonalities v0.4.0
+* Identity and Consent Management v0.2.0
+
+Note: the previous qod v0.10.1 API with endpoints for QoS Sessions and QoS Profiles has been split into two APIs. There are additional breaking changes.
+
+## quality-on-demand v0.11.0
+
+Version 0.11.0 provides the QoS Sessions endpoints from v0.10.1, adds one endpoint /retrieve-sessions, and is aligned with Commonalities 0.4.0 and Identity and Consent Management 0.2.0. **There are breaking changes compared to v0.10.1.**
+
+- API definition **with inline documentation**:
+ - [View it on ReDoc](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/quality-on-demand.yaml&nocors)
+ - [View it on Swagger Editor](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/quality-on-demand.yaml)
+ - OpenAPI [YAML spec file](https://github.com/camaraproject/QualityOnDemand/blob/r1.2/code/API_definitions/quality-on-demand.yaml)
+
+### Added
+* Added a new operation `retrieveSessions` to get a list of sessions for a given device by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/325
+* Added the `statusInfo` as parameter to `SessionInfo` by @maxl2287 in https://github.com/camaraproject/QualityOnDemand/pull/273
+* Added the `x-correlator` header to requests and responses by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/283
+* Added security scheme and scopes for each endpoint / method by @eric-murray in https://github.com/camaraproject/QualityOnDemand/pull/295
+
+
+### Changed
+* Made `+` prefix mandatory for phoneNumber by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/301
+* Clarified concepts and properties related to the management of session duration and session extension by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/296
+* Updated Authorization and Authentication text to ICM release 0.2.0 wording by @eric-murray in https://github.com/camaraproject/QualityOnDemand/pull/327
+* Aligned with Commonalities' updated subscription-model by using `sink` and `sinkCredentials` by @maxl2287 in https://github.com/camaraproject/QualityOnDemand/pull/335
+* Aligned quality-on-demand further with Commonalties 0.4.0 by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/326
+ * Added documentation about "Handling of device information" within the info description.
+ * Made device parameter optional within `createSession`
+ * Aligned `Device` object and `info` object with Commonalities
+ * Updated schemata for error responses according to Commonalities
+
+### Fixed
+* Removed unresolved documentation reference within quality-on-demand.yaml by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/324
+
+### Removed
+* Removed unused `messages` object in the `SessionInfo` schema by @sfnuser in https://github.com/camaraproject/QualityOnDemand/pull/312
+* Removed `TermsOfService` and `Contact` from `info` objects (they may be added by API Providers documenting their APIs) by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/311
+* Removed cucumber directory and its content by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/323
+
+## qos-profiles v0.11.0
+
+qos-profiles 0.11.0 provides the QoS Profiles endpoints from v0.10.1, changed the retrieval operation to allow the get the QoS Profiles available for a given device, and is aligned with Commonalities 0.4.0 and Identity and Consent Management 0.2.0. **There are breaking changes compared to v0.10.1.**
+
+- API definition **with inline documentation**:
+ - [View it on ReDoc](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qos-profiles.yaml&nocors)
+ - [View it on Swagger Editor](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qos-profiles.yaml)
+ - OpenAPI [YAML spec file](https://github.com/camaraproject/QualityOnDemand/blob/r1.2/code/API_definitions/qos-profiles.yaml)
+
+### Added
+* Added the option to query QoS profiles available on a given device by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/318
+* Added `x-correlator` header to requests and responses by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/283
+* Added security scheme and scopes for each endpoint / method by @eric-murray in https://github.com/camaraproject/QualityOnDemand/pull/295
+
+### Changed
+* Changed the query for `/qos-profiles` from a GET to a POST to support the query for profiles available on a given device by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/318
+* Updated the description of `maxDuration` by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/296
+* Updated Authorization and Authentication text to ICM release 0.2.0 wording by @eric-murray in https://github.com/camaraproject/QualityOnDemand/pull/327
+* Aligned qos-profiles further with Commonalties 0.4.0 by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/326
+ * Added documentation about "Handling of device information" within the info description.
+ * Updated schemata for error responses according to Commonalities
+
+### Fixed
+* n/a
+
+### Removed
+* Removed `TermsOfService` and `Contact` from `info` objects (they may be added by API Providers documenting their APIs) by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/311
+
+## qod-provisioning v0.1.0
+
+qod-provisioning v0.1.0 is the first initial release of this new API. It provides the ability to set a QoS profile for a device within an access network which will be applied each time the device connects to the same access network.
+
+- API definition **with inline documentation**:
+ - [View it on ReDoc](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qod-provisioning.yaml&nocors)
+ - [View it on Swagger Editor](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qod-provisioning.yaml)
+ - OpenAPI [YAML spec file](https://github.com/camaraproject/QualityOnDemand/blob/r1.2/code/API_definitions/qod-provisioning.yaml)
+
+### Added
+* Initial version of QoD Provisioning mode API by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/299
+
+### Changed
+* n/a
+
+### Fixed
+* n/a
+
+### Removed
+* n/a
+
+**Full Changelog**: https://github.com/camaraproject/QualityOnDemand/compare/v0.10.1...r1.2
+
+# r1.1
+## Release Notes
+
This pre-release contains the definition and documentation of
* quality-on-demand v0.11.0-rc.1
* qos-profiles v0.11.0-rc.1
From e6a18f488333c7e074166c8d342bb6d32a01d136 Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Fri, 23 Aug 2024 13:41:39 +0200
Subject: [PATCH 04/16] Update README.md
---
README.md | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
index 194ad8954d..433beb7f8f 100644
--- a/README.md
+++ b/README.md
@@ -22,31 +22,32 @@ Repository to describe, develop, document and test the QualityOnDemand API famil
* Started: October 2021
* Location: virtually
-## Status and released versions
+## Release Information
* Note: Please be aware that the project will have frequent updates to the main branch. There are no compatibility guarantees associated with code in any branch, including main, until a new release is created. For example, changes may be reverted before a release is created. **For best results, use the latest public release**.
-* The latest public release is available here: https://github.com/camaraproject/QualityOnDemand/releases/latest
-* For changes see [CHANGELOG.md](https://github.com/camaraproject/QualityOnDemand/blob/main/CHANGELOG.md)
-* The current pre-release for the [Fall24 meta-release](https://wiki.camaraproject.org/display/CAM/Meta-release+Fall24) is [r1.1](https://github.com/camaraproject/QualityOnDemand/tree/r1.1)
-The release r1.1 contains the following API definitions (with inline documentation):
- * **quality-on-demand v0.11.0-rc.1**
- [[YAML]](https://github.com/camaraproject/QualityOnDemand/blob/r1.1/code/API_definitions/quality-on-demand.yaml)
- [[View it on ReDoc]](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.1/code/API_definitions/quality-on-demand.yaml&nocors)
- [[View it on Swagger Editor]](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.1/code/API_definitions/quality-on-demand.yaml)
+* **The latest public release is [r1.2](https://github.com/camaraproject/QualityOnDemand/tree/r1.2) with the following API definitions:**
+
+ * **quality-on-demand v0.11.0**
+ [[YAML]](https://github.com/camaraproject/QualityOnDemand/blob/r1.2/code/API_definitions/quality-on-demand.yaml)
+ [[View it on ReDoc]](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/quality-on-demand.yaml&nocors)
+ [[View it on Swagger Editor]](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/quality-on-demand.yaml)
- * **qos-profiles v0.11.0-rc.1**
- [[YAML]](https://github.com/camaraproject/QualityOnDemand/blob/r1.1/code/API_definitions/qos-profiles.yaml)
- [[View it on ReDoc]](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.1/code/API_definitions/qos-profiles.yaml&nocors)
- [[View it on Swagger Editor]](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.1/code/API_definitions/qos-profiles.yaml)
+ * **qos-profiles v0.11.0**
+ [[YAML]](https://github.com/camaraproject/QualityOnDemand/blob/r1.2/code/API_definitions/qos-profiles.yaml)
+ [[View it on ReDoc]](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qos-profiles.yaml&nocors)
+ [[View it on Swagger Editor]](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qos-profiles.yaml)
- * qod-provisioning v0.1.0-rc.1 (new, first initial version)
- [[YAML]](https://github.com/camaraproject/QualityOnDemand/blob/r1.1/code/API_definitions/qod-provisioning.yaml)
- [[View it on ReDoc]](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.1/code/API_definitions/qod-provisioning.yaml&nocors)
- [[View it on Swagger Editor]](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.1/code/API_definitions/qod-provisioning.yaml)
+ * qod-provisioning v0.1.0 (new, first initial version)
+ [[YAML]](https://github.com/camaraproject/QualityOnDemand/blob/r1.2/code/API_definitions/qod-provisioning.yaml)
+ [[View it on ReDoc]](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qod-provisioning.yaml&nocors)
+ [[View it on Swagger Editor]](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qod-provisioning.yaml)
+
+* Previous releases and pre-releases are available here: https://github.com/camaraproject/QualityOnDemand/releases/latest
+* For changes see [CHANGELOG.md](https://github.com/camaraproject/QualityOnDemand/blob/main/CHANGELOG.md)
-* Provider implementations (PI) are available within separate repositories (partly for previous releases):
+* Provider implementations (PI) for previous releases are available within separate repositories:
* [QualityOnDemand_PI1](https://github.com/camaraproject/QualityOnDemand_PI1) by Deutsche Telekom
* [QualityOnDemand_PI2](https://github.com/camaraproject/QualityOnDemand_PI2) by Orange
From aa020943b4557ba71030bfe331d73af419126a1f Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Fri, 23 Aug 2024 13:42:51 +0200
Subject: [PATCH 05/16] Update CHANGELOG.md
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4df8de410..63cb8a8d89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@
**Please be aware that the project will have frequent updates to the main branch. There are no compatibility guarantees associated with code in any branch, including main, until it has been released. For example, changes may be reverted before a release is published. For the best results, use the latest published release.**
-# r1.1
+# r1.2
## Release Notes
This public release contains the definition and documentation of
From f3c8b87a91d911e4d4f7b261ecf79954061caba4 Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Fri, 23 Aug 2024 13:44:47 +0200
Subject: [PATCH 06/16] Update CHANGELOG.md
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63cb8a8d89..2ecd2aa733 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
# Changelog QualityOnDemand
## Table of Contents
-- [r1.2](#r12)
+- **[r1.2](#r12)**
- [r1.1](#r11)
- [v0.10.1](#v0101)
- [v0.10.0](#v0100)
From c46831b7fdf32ca9870d344dc74802a9c97e2f7d Mon Sep 17 00:00:00 2001
From: Herbert Damker
Date: Fri, 23 Aug 2024 14:38:38 +0200
Subject: [PATCH 07/16] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 433beb7f8f..4de4a7e388 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Repository to describe, develop, document and test the QualityOnDemand API famil
[[View it on ReDoc]](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qod-provisioning.yaml&nocors)
[[View it on Swagger Editor]](https://editor.swagger.io/?url=https://raw.githubusercontent.com/camaraproject/QualityOnDemand/r1.2/code/API_definitions/qod-provisioning.yaml)
-* Previous releases and pre-releases are available here: https://github.com/camaraproject/QualityOnDemand/releases/latest
+* Previous releases and pre-releases are available here: https://github.com/camaraproject/QualityOnDemand/releases
* For changes see [CHANGELOG.md](https://github.com/camaraproject/QualityOnDemand/blob/main/CHANGELOG.md)
* Provider implementations (PI) for previous releases are available within separate repositories:
From 3f7afc87728e59d17c8776765e2d6b3da365f783 Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Fri, 23 Aug 2024 17:36:15 +0200
Subject: [PATCH 08/16] Update CHANGELOG.md
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ecd2aa733..d5ff932069 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,7 +74,7 @@ qos-profiles 0.11.0 provides the QoS Profiles endpoints from v0.10.1, changed th
- OpenAPI [YAML spec file](https://github.com/camaraproject/QualityOnDemand/blob/r1.2/code/API_definitions/qos-profiles.yaml)
### Added
-* Added the option to query QoS profiles available on a given device by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/318
+* Added the option to query QoS profiles available on a given device by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/318 and https://github.com/camaraproject/QualityOnDemand/pull/348
* Added `x-correlator` header to requests and responses by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/283
* Added security scheme and scopes for each endpoint / method by @eric-murray in https://github.com/camaraproject/QualityOnDemand/pull/295
From 4a70dc95154073841a5adeeae7b2f0945ceb3a92 Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Thu, 29 Aug 2024 08:55:44 +0200
Subject: [PATCH 09/16] Update CHANGELOG.md
Added PRs #348, #349, #354
---
CHANGELOG.md | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5ff932069..594e4d9dd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,7 @@ Version 0.11.0 provides the QoS Sessions endpoints from v0.10.1, adds one endpoi
* Added the `statusInfo` as parameter to `SessionInfo` by @maxl2287 in https://github.com/camaraproject/QualityOnDemand/pull/273
* Added the `x-correlator` header to requests and responses by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/283
* Added security scheme and scopes for each endpoint / method by @eric-murray in https://github.com/camaraproject/QualityOnDemand/pull/295
-
+* Added test definitions for quality-on-demand by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/349
### Changed
* Made `+` prefix mandatory for phoneNumber by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/301
@@ -55,6 +55,7 @@ Version 0.11.0 provides the QoS Sessions endpoints from v0.10.1, adds one endpoi
* Made device parameter optional within `createSession`
* Aligned `Device` object and `info` object with Commonalities
* Updated schemata for error responses according to Commonalities
+* Updated user story for Quality on Demand by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/354
### Fixed
* Removed unresolved documentation reference within quality-on-demand.yaml by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/324
@@ -77,9 +78,10 @@ qos-profiles 0.11.0 provides the QoS Profiles endpoints from v0.10.1, changed th
* Added the option to query QoS profiles available on a given device by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/318 and https://github.com/camaraproject/QualityOnDemand/pull/348
* Added `x-correlator` header to requests and responses by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/283
* Added security scheme and scopes for each endpoint / method by @eric-murray in https://github.com/camaraproject/QualityOnDemand/pull/295
+* Added test definitions for qos-profiles by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/349
### Changed
-* Changed the query for `/qos-profiles` from a GET to a POST to support the query for profiles available on a given device by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/318
+* Changed the query for `/qos-profiles` from a GET to a POST to support the query for profiles available on a given device and changed the endpoint name to `/retrieve-qos-profiles` by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/318 and
* Updated the description of `maxDuration` by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/296
* Updated Authorization and Authentication text to ICM release 0.2.0 wording by @eric-murray in https://github.com/camaraproject/QualityOnDemand/pull/327
* Aligned qos-profiles further with Commonalties 0.4.0 by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/326
@@ -103,6 +105,7 @@ qod-provisioning v0.1.0 is the first initial release of this new API. It provide
### Added
* Initial version of QoD Provisioning mode API by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/299
+* Added test definitions for qod-provisioning by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/349
### Changed
* n/a
From 7c591bbedf593a49c2192a145b8ec251f88f8ab2 Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Thu, 29 Aug 2024 08:57:42 +0200
Subject: [PATCH 10/16] Update CHANGELOG.md
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 594e4d9dd7..7efed88346 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,7 +81,7 @@ qos-profiles 0.11.0 provides the QoS Profiles endpoints from v0.10.1, changed th
* Added test definitions for qos-profiles by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/349
### Changed
-* Changed the query for `/qos-profiles` from a GET to a POST to support the query for profiles available on a given device and changed the endpoint name to `/retrieve-qos-profiles` by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/318 and
+* Changed the query for `/qos-profiles` from a GET to a POST to support the query for profiles available on a given device and changed the endpoint name to `/retrieve-qos-profiles` by @RandyLevensalor in https://github.com/camaraproject/QualityOnDemand/pull/318 and https://github.com/camaraproject/QualityOnDemand/pull/348
* Updated the description of `maxDuration` by @jlurien in https://github.com/camaraproject/QualityOnDemand/pull/296
* Updated Authorization and Authentication text to ICM release 0.2.0 wording by @eric-murray in https://github.com/camaraproject/QualityOnDemand/pull/327
* Aligned qos-profiles further with Commonalties 0.4.0 by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/326
From 09ce7f4852f3c48c935aca7a87516b2188194033 Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Fri, 30 Aug 2024 12:01:09 +0200
Subject: [PATCH 11/16] Update CHANGELOG.md
added PR #356
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7efed88346..c6ba0e85b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@ Version 0.11.0 provides the QoS Sessions endpoints from v0.10.1, adds one endpoi
* Aligned `Device` object and `info` object with Commonalities
* Updated schemata for error responses according to Commonalities
* Updated user story for Quality on Demand by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/354
+* Clarified behavior of extendQosSessionDuration if session is not in state AVAILABLE by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/356
### Fixed
* Removed unresolved documentation reference within quality-on-demand.yaml by @hdamker in https://github.com/camaraproject/QualityOnDemand/pull/324
From e7bd70188974562853d3d96132ca54585b560c6b Mon Sep 17 00:00:00 2001
From: Herbert Damker
Date: Fri, 30 Aug 2024 20:38:51 +0200
Subject: [PATCH 12/16] Update quality-on-demand.yaml - SessionInfo description
Clarification of "optional device object" within SessionInfo Description to address issue #340
---
code/API_definitions/quality-on-demand.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/API_definitions/quality-on-demand.yaml b/code/API_definitions/quality-on-demand.yaml
index 5e1821ebf0..1a9618d878 100644
--- a/code/API_definitions/quality-on-demand.yaml
+++ b/code/API_definitions/quality-on-demand.yaml
@@ -516,7 +516,7 @@ components:
SessionInfo:
description: |
Session related information returned in responses.
- Optional device object only to be returned if provided in createSession. If more than one type of device identifier was provided, only one identifier will be returned (at implementation choice and with the original value provided in createSession).
+ Note that the device object is defined as optional and will only to be returned if provided in createSession. If more than one type of device identifier was provided, only one identifier will be returned (at implementation choice and with the original value provided in createSession).
Please note that IP addresses of devices can change and get reused, so the original values may no longer identify the same device. They identified the device at the time of session creation.
allOf:
- $ref: "#/components/schemas/BaseSessionInfo"
From f5513d8e06243a451f035d7cf4b31658f0d7da24 Mon Sep 17 00:00:00 2001
From: Herbert Damker
Date: Thu, 5 Sep 2024 17:27:30 +0200
Subject: [PATCH 13/16] Update
documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md
---
.../quality-on-demand-API-Readiness-Checklist.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md b/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md
index ee935abfff..bb8e617127 100644
--- a/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md
+++ b/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md
@@ -15,7 +15,9 @@ Checklist for quality-on-demand v0.11.0 in r1.2
| 9 | Test result statement | O | O | O | M | N | |
| 10 | API release numbering convention applied | M | M | M | M | Y | |
| 11 | Change log updated | M | M | M | M | Y | [/CHANGELOG.md](/CHANGELOG.md) |
-| 12 | Previous public release was certified | O | O | O | M | ? | |
+| 12 | Previous public release was certified | O | O | O | M | Y | * |
+
+* GSMA certified implementation by China Unicom, multiple other implementation by operators (source: https://www.open-gateway.com/operators-map as of 2024-08-16)
To fill the checklist:
- in the line above the table, replace the api-name, api-version and the rx.y by their actual values for the current API version and release.
From cdf39329764126d2f2d65e06887a48967c31e710 Mon Sep 17 00:00:00 2001
From: Herbert Damker
Date: Thu, 5 Sep 2024 17:40:00 +0200
Subject: [PATCH 14/16] Update README.md
---
README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/README.md b/README.md
index 4de4a7e388..199f9315fc 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ Repository to describe, develop, document and test the QualityOnDemand API famil
* get notification if the network cannot fulfill
* Describe, develop, document and test the APIs (with 1–2 Service Providers)
* Started: October 2021
-* Location: virtually
## Release Information
From 189b7c0579d16fab998770a5ab26533a90cf5fb1 Mon Sep 17 00:00:00 2001
From: Herbert Damker
Date: Thu, 5 Sep 2024 17:51:17 +0200
Subject: [PATCH 15/16] Update quality-on-demand-API-Readiness-Checklist.md
---
.../quality-on-demand-API-Readiness-Checklist.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md b/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md
index bb8e617127..00d8cbe9a0 100644
--- a/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md
+++ b/documentation/API_documentation/quality-on-demand-API-Readiness-Checklist.md
@@ -15,9 +15,9 @@ Checklist for quality-on-demand v0.11.0 in r1.2
| 9 | Test result statement | O | O | O | M | N | |
| 10 | API release numbering convention applied | M | M | M | M | Y | |
| 11 | Change log updated | M | M | M | M | Y | [/CHANGELOG.md](/CHANGELOG.md) |
-| 12 | Previous public release was certified | O | O | O | M | Y | * |
+| 12 | Previous public release was certified | O | O | O | M | Y | see (1) |
-* GSMA certified implementation by China Unicom, multiple other implementation by operators (source: https://www.open-gateway.com/operators-map as of 2024-08-16)
+(1) GSMA certified implementation of previous version by China Unicom, multiple implementation by other operators (source: https://www.open-gateway.com/operators-map as of 2024-08-16)
To fill the checklist:
- in the line above the table, replace the api-name, api-version and the rx.y by their actual values for the current API version and release.
From 29a0bf23293db4b12948dc0255d72629a18db6aa Mon Sep 17 00:00:00 2001
From: Herbert Damker <52109189+hdamker@users.noreply.github.com>
Date: Thu, 5 Sep 2024 18:01:42 +0200
Subject: [PATCH 16/16] Delete duplicate license file in /code
---
code/LICENSE.APACHE2.0 | 202 -----------------------------------------
1 file changed, 202 deletions(-)
delete mode 100644 code/LICENSE.APACHE2.0
diff --git a/code/LICENSE.APACHE2.0 b/code/LICENSE.APACHE2.0
deleted file mode 100644
index d645695673..0000000000
--- a/code/LICENSE.APACHE2.0
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.