Skip to content

Commit

Permalink
Merge pull request #41 from FIWARE-TMForum/develop
Browse files Browse the repository at this point in the history
Version 7.4.0
  • Loading branch information
fdelavega authored Oct 23, 2018
2 parents b67693c + ad6c13f commit dd79474
Show file tree
Hide file tree
Showing 23 changed files with 1,217 additions and 970 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
*~
.*
*.pyc
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
[![](https://img.shields.io/badge/FIWARE-Data_Monetization-51b6a3.svg?label=FIWARE&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAVCAYAAAC33pUlAAAABHNCSVQICAgIfAhkiAAAA8NJREFUSEuVlUtIFlEUx+eO+j3Uz8wSLLJ3pBiBUljRu1WLCAKXbXpQEUFERSQF0aKVFAUVrSJalNXGgmphFEhQiZEIPQwKLbEUK7VvZrRvbr8zzjfNl4/swplz7rn/8z/33HtmRhn/MWzbXmloHVeG0a+VSmAXorXS+oehVD9+0zDN9mgk8n0sWtYnHo5tT9daH4BsM+THQC8naK02jCZ83/HlKaVSzBey1sm8BP9nnUpdjOfl/Qyzj5ust6cnO5FItJLoJqB6yJ4QuNcjVOohegpihshS4F6S7DTVVlNtFFxzNBa7kcaEwUGcbVnH8xOJD67WG9n1NILuKtOsQG9FngOc+lciic1iQ8uQGhJ1kVAKKXUs60RoQ5km93IfaREvuoFj7PZsy9rGXE9G/NhBsDOJ63Acp1J82eFU7OIVO1OxWGwpSU5hb0GqfMydMHYSdiMVnncNY5Vy3VbwRUEydvEaRxmAOSSqJMlJISTxS9YWTYLcg3B253xsPkc5lXk3XLlwrPLuDPKDqDIutzYaj3eweMkPeCCahO3+fEIF8SfLtg/5oI3Mh0ylKM4YRBaYzuBgPuRnBYD3mmhA1X5Aka8NKl4nNz7BaKTzSgsLCzWbvyo4eK9r15WwLKRAmmCXXDoA1kaG2F4jWFbgkxUnlcrB/xj5iHxFPiBN4JekY4nZ6ccOiQ87hgwhe+TOdogT1nfpgEDTvYAucIwHxBfNyhpGrR+F8x00WD33VCNTOr/Wd+9C51Ben7S0ZJUq3qZJ2OkZz+cL87ZfWuePlwRcHZjeUMxFwTrJZAJfSvyWZc1VgORTY8rBcubetdiOk+CO+jPOcCRTF+oZ0okUIyuQeSNL/lPrulg8flhmJHmE2gBpE9xrJNkwpN4rQIIyujGoELCQz8ggG38iGzjKkXufJ2Klun1iu65bnJub2yut3xbEK3UvsDEInCmvA6YjMeE1bCn8F9JBe1eAnS2JksmkIlEDfi8R46kkEkMWdqOv+AvS9rcp2bvk8OAESvgox7h4aWNMLd32jSMLvuwDAwORSE7Oe3ZRKrFwvYGrPOBJ2nZ20Op/mqKNzgraOTPt6Bnx5citUINIczX/jUw3xGL2+ia8KAvsvp0ePoL5hXkXO5YvQYSFAiqcJX8E/gyX8QUvv8eh9XUq3h7mE9tLJoNKqnhHXmCO+dtJ4ybSkH1jc9XRaHTMz1tATBe2UEkeAdKu/zWIkUbZxD+veLxEQhhUFmbnvOezsJrk+zmqMo6vIL2OXzPvQ8v7dgtpoQnkF/LP8Ruu9zXdJHg4igAAAABJRU5ErkJgggA=)](https://www.fiware.org/developers/catalogue/)
[![License badge](https://img.shields.io/github/license/FIWARE-TMForum/Business-API-Ecosystem.svg)](https://opensource.org/licenses/AGPL-3.0)
[![Documentation badge](https://img.shields.io/readthedocs/business-api-ecosystem.svg)](https://business-api-ecosystem.rtfd.io)
[![Docker](https://img.shields.io/docker/pulls/fiware/business-api-ecosystem.svg)](https://hub.docker.com/r/fiware/business-api-ecosystem)
[![](https://img.shields.io/badge/tag-fiware-orange.svg?logo=stackoverflow)](http://stackoverflow.com/questions/tagged/fiware)
[![Support](https://img.shields.io/badge/support-askbot-yellowgreen.svg)](https://ask.fiware.org)
[![Docker](https://img.shields.io/docker/pulls/fiware/business-api-ecosystem.svg)](https://hub.docker.com/r/fiware/business-api-ecosystem) [![](https://img.shields.io/badge/tag-fiware-orange.svg?logo=stackoverflow)](http://stackoverflow.com/questions/tagged/fiware) [![Support](https://img.shields.io/badge/support-askbot-yellowgreen.svg)](https://ask.fiware.org)

* [Introduction](#introduction)
* [GEi Overall Description](#gei-overall-description)
Expand Down
110 changes: 40 additions & 70 deletions apiary.apib
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FORMAT: 1A
HOST: https://store.lab.fiware.org/
TITLE: FIWARE Business API Ecosystem Open API Specification
DATE: 23 January 2017
VERSION: v6.4.0
PREVIOUS_VERSION: v5.4.1
VERSION: v7.4.0
PREVIOUS_VERSION: vpdate
APIARY_PROJECT: fiwaretmfbizecosystem
SPEC_URL: https://fiware-tmforum.github.io/Business-API-Ecosystem/
SPEC_URL: https://fiwareckanextensions.docs.apiary.io/#
GITHUB_SOURCE: https://github.com/FIWARE-TMForum

# FIWARE TMF Business API Ecosystem
Expand All @@ -25,16 +25,16 @@ inventory management, usage management, billing, customer, and party APIs.
## Status

This is a work in progress and is changing on a daily basis. You can check the latest
available version on [GitHub](https://github.com/FIWARE-TMForum).
available version on [GitHub](https://github.com/FIWARE-TMForum/Business-API-Ecosystem).

Please send your comments to <[email protected]>.
The current specification includes the latest API specification. For the API specification
of particular releases, please refer to [GitHub Pages](https://fiware-tmforum.github.io/Business-API-Ecosystem/)

This specification is licensed under the [FIWARE Open Specification License](https://forge.fiware.org/plugins/mediawiki/wiki/fiware/index.php/FI-WARE_Open_Specification_Legal_Notice_%28implicit_patents_license%29)

## Acknowledgements

The editors would like to express their gratitude to the following people who actively contributed to this specification:
Pierre Gauthier, Aitor Magán, and Álvaro Arranz García
The editors would like to express their gratitude to Aitor Magán and Álvaro Arranz who actively contributed to this specification.

## Copyright

Expand All @@ -44,8 +44,7 @@ Pierre Gauthier, Aitor Magán, and Álvaro Arranz García
## License

This specification is licensed under the
[FIWARE Open Specification License (implicit patent license)]
(https://forge.fiware.org/plugins/mediawiki/wiki/fiware/index.php/Implicit_Patents_License).
[FIWARE Open Specification License (implicit patent license)](https://forge.fiware.org/plugins/mediawiki/wiki/fiware/index.php/Implicit_Patents_License).

## Specification

Expand Down Expand Up @@ -108,12 +107,12 @@ API for retrieving information about the running instance. It manages the follow
+ Response 200 (application/json)

{
"version": "v6.4.0",
"release_date": "2017-12-20",
"version": "v7.4.0",
"release_date": "2018-10-12",
"uptime": "2 d, 3 h, 15 m, 50 s",
"git_hash": "808f4bf995bddf0f6a05576956987f2568522062",
"doc": "http://business-api-ecosystem.readthedocs.io/",
"user_doc": "http://business-api-ecosystem.readthedocs.io/en/v6.4.0/user-guide.html"
"user_doc": "http://business-api-ecosystem.readthedocs.io/en/v7.4.0/user-guide.html"
}


Expand Down Expand Up @@ -2343,59 +2342,6 @@ For the different individuals of the system the following information is used:
}]
}
]

### Create Individual [POST]

+ Request (application/json)

+ Headers

Authorization: Bearer YOUR_OAUTH2_TOKEN

+ Body

{
"id": "francisco-de-la-vega",
"birthDate": "1970-01-04T01:00:00+01:00",
"countryOfBirth": "DZ",
"familyName": "de la Vega",
"gender": "Male",
"givenName": "Francisco",
"maritalStatus": "Married",
"nationality": "spanish",
"placeOfBirth": "Madrid",
"title": "Mr",
"contactMedium": [{
"type": "Email",
"preferred": "false",
"medium": {
"emailAddress": "[email protected]"
}
}]
}

+ Response 201 (application/json)

{
"id": "francisco-de-la-vega",
"href": "http://store.lab.fiware.org/DSPartyManagement/api/partyManagement/v2/individual/francisco-de-la-vega",
"birthDate": "1970-01-04T01:00:00+01:00",
"countryOfBirth": "DZ",
"familyName": "de la Vega",
"gender": "Male",
"givenName": "Francisco",
"maritalStatus": "Married",
"nationality": "spanish",
"placeOfBirth": "Madrid",
"title": "Mr",
"contactMedium": [{
"type": "Email",
"preferred": "false",
"medium": {
"emailAddress": "[email protected]"
}
}]
}

## Individual Entry [/DSPartyManagement/api/partyManagement/v2/individual/{id}]

Expand Down Expand Up @@ -3212,7 +3158,7 @@ This API uses the following fields:
* **href** - URL pointing to the Usage Specification
* **name** - Name of the usage specification
* **description** - Textual description of the Usage Specification
* ** usageSpecCharacteristic** - List of characteristics which define the specific attributes of the described usage documents. Each characteristic is defined with the same format as the *productSpecCharacteristic* field of the Product Specification object, defined in the *Product Specification Management API* section
* **usageSpecCharacteristic** - List of characteristics which define the specific attributes of the described usage documents. Each characteristic is defined with the same format as the *productSpecCharacteristic* field of the Product Specification object, defined in the *Product Specification Management API* section

Note, that for a usage document to be processed and understood by the system, it is required to include some fields which must also be defined as characteristics of the Usage Specification. This fields are:

Expand All @@ -3222,7 +3168,8 @@ Note, that for a usage document to be processed and understood by the system, it
* **unit** - Unit being monitored while accounting the service (e.g second, call, megabyte, etc)
* **value** - Usage made of the service of the given unit

## Usage Specification Collection [DSUsageManagement/api/usageManagement/v2/usageSpecification]

## Usage Specification Collection [/DSUsageManagement/api/usageManagement/v2/usageSpecification]

### List Usage Specifications [GET]

Expand Down Expand Up @@ -3301,6 +3248,17 @@ Note, that for a usage document to be processed and understood by the system, it

### Create Usage Specification [POST]

As can be seen, the *Create Usage Specification* request includes a header *X-API-Key*. This header
has been included in order to enable the authentication of accounting applications which generate
the usage information.

It is important to note, that the API key which must be used to create usage records cannot be
requested directly by users of the platform, since they are only issued to approved accounting applications.
In this regard, there are two mechanisms to get an API Key:

* **manually** - The API key can be requested to an admin of the system who can manually create and deliver it.
* **automatically** - The API key can be generated automatically from the code of an asset plugin and then sent to the accounting application using the plugin event handlers. See the [programmer guide](http://business-api-ecosystem.readthedocs.io/en/latest/programmer-guide.html) for details on this topic.

+ Request (application/json)

+ Headers
Expand Down Expand Up @@ -3436,7 +3394,7 @@ Note, that for a usage document to be processed and understood by the system, it
}]
}

## Usage Specification Entry [DSUsageManagement/api/usageManagement/v2/usageSpecification/{id}]
## Usage Specification Entry [/DSUsageManagement/api/usageManagement/v2/usageSpecification/{id}]

### Get Usage Specification [GET]

Expand Down Expand Up @@ -3550,7 +3508,7 @@ Note, that for a usage document to be processed and understood by the system, it
* **unit** - Unit being monitored while accounting the service (e.g second, call, megabyte, etc)
* **value** - Usage made of the service of the given unit

## Usage Collection [DSUsageManagement/api/usageManagement/v2/usage]
## Usage Collection [/DSUsageManagement/api/usageManagement/v2/usage]

### List Usages [GET]

Expand Down Expand Up @@ -3616,6 +3574,18 @@ Note, that for a usage document to be processed and understood by the system, it

### Create Usage [POST]


As can be seen, the *Create Usage* request includes a header *X-API-Key*. This header
has been included in order to enable the authentication of accounting applications which generate
the usage information.

It is important to note, that the API key which must be used to create usage records cannot be
requested directly by users of the platform, since they are only issued to approved accounting applications.
In this regard, there are two mechanisms to get an API Key:

* **manually** - The API key can be requested to an admin of the system who can manually create and deliver it.
* **automatically** - The API key can be generated automatically from the code of an asset plugin and then sent to the accounting application using the plugin event handlers. See the [programmer guide](http://business-api-ecosystem.readthedocs.io/en/latest/programmer-guide.html) for details on this topic.

+ Request (application/json)

+ Headers
Expand Down Expand Up @@ -3725,7 +3695,7 @@ Note, that for a usage document to be processed and understood by the system, it
]
}

## Usage Entry [DSUsageManagement/api/usageManagement/v2/usage/{id}]
## Usage Entry [/DSUsageManagement/api/usageManagement/v2/usage/{id}]

### Get Usage [GET]

Expand Down
Loading

0 comments on commit dd79474

Please sign in to comment.