Skip to content

Commit

Permalink
Switching to user-context
Browse files Browse the repository at this point in the history
  • Loading branch information
@jason-fox
jason-fox committed Jul 10, 2024
1 parent 3170912 commit 4b8bbcc
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions README.ja.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ tutorial:
- "DUMMY_DEVICES_API_KEY=4jggokgpepnvsb2uv4s40d59ov"
- "DUMMY_DEVICES_TRANSPORT=HTTP"
- "DUMMY_DEVICES_PAYLOAD=JSON"
- "IOTA_JSON_LD_CONTEXT=http://context/ngsi-context.jsonld"
- "IOTA_JSON_LD_CONTEXT=http://context/user-context.jsonld"
```
`tutorial` コンテナは2つのポートでリッスンしています:
Expand All @@ -272,7 +272,7 @@ tutorial:
| DUMMY_DEVICES_API_KEY | `4jggokgpepnvsb2uv4s40d59ov` | JSON インタラクションに使用されるランダムなセキュリティ・キー - デバイスと IoT Agent 間の相互作用の整合性を確保するために使用されます |
| DUMMY_DEVICES_TRANSPORT | `HTTP` | ダミー IoT デバイスで使用されるトランスポート・プロトコル |
| DUMMY_DEVICES_PAYLOAD | `JSON` | ダミー IoT デバイスで使用されるペイロード形式 |
| IOTA_JSON_LD_CONTEXT | `http://context/ngsi-context.jsonld` | デバイス・データモデルの定義に使用される `@context` ファイルの場所 |
| IOTA_JSON_LD_CONTEXT | `http://context/user-context.jsonld` | デバイス・データモデルの定義に使用される `@context` ファイルの場所 |

YAML ファイルで説明されている他の `tutorial` コンテナ設定値は、このチュートリアルでは使用しません。

Expand Down Expand Up @@ -314,7 +314,7 @@ iot-agent:
- IOTA_HTTP_PORT=7896
- IOTA_PROVIDER_URL=http://iot-agent:4041
- IOTA_DEFAULT_RESOURCE=/iot/json
- IOTA_JSON_LD_CONTEXT=http://context/ngsi-context.jsonld
- IOTA_JSON_LD_CONTEXT=http://context/user-context.jsonld
- IOTA_FALLBACK_TENANT=openiot
- IOTA_MULTI_CORE=true
```
Expand Down Expand Up @@ -343,7 +343,7 @@ iot-agent:
| IOTA_MONGO_DB | `iotagentul` | mongoDB で使用されるデータベースの名前 |
| IOTA_HTTP_PORT | `7896` | IoT Agent が HTTP 経由で IoT デバイス トラフィックをリッスンするポート |
| IOTA_PROVIDER_URL | `http://iot-agent:4041` | コマンドの登録時に Context Broker に渡される URL。Context Broker がデバイスにコマンドを発行するときにフォワーディング URL の場所として使用されます |
| IOTA_JSON_LD_CONTEXT | `http://context/ngsi-context.jsonld` | デバイス データ モデルの定義に使用される `@context` ファイルの場所 |
| IOTA_JSON_LD_CONTEXT | `http://context/user-context.jsonld` | デバイス データ モデルの定義に使用される `@context` ファイルの場所 |
| IOTA_FALLBACK_TENANT | `openiot` | 通信から明示的なテナントを受信していない場合に使用するテナント |

<a name="prerequisites"></a>
Expand Down Expand Up @@ -715,7 +715,7 @@ curl -G -iX GET 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:te
```json
{
"@context": [
"http://context/ngsi-context.jsonld",
"http://context/user-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.7.jsonld"
],
"id": "urn:ngsi-ld:Device:temperature001",
Expand Down Expand Up @@ -767,7 +767,7 @@ curl -L -X GET 'http://localhost:1026/ngsi-ld/v1/entities/?type=Device' \
[
{
"@context": [
"http://context/ngsi-context.jsonld",
"http://context/user-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.7.jsonld"
],
"id": "urn:ngsi-ld:Device:motion003",
Expand Down
12 changes: 6 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ tutorial:
- "DUMMY_DEVICES_API_KEY=4jggokgpepnvsb2uv4s40d59ov"
- "DUMMY_DEVICES_TRANSPORT=HTTP"
- "DUMMY_DEVICES_PAYLOAD=JSON"
- "IOTA_JSON_LD_CONTEXT=http://context/ngsi-context.jsonld"
- "IOTA_JSON_LD_CONTEXT=http://context/user-context.jsonld"
```
The `tutorial` container is listening on two ports:
Expand All @@ -276,7 +276,7 @@ The `tutorial` container is driven by environment variables as shown:
| DUMMY_DEVICES_API_KEY | `4jggokgpepnvsb2uv4s40d59ov` | Random security key used for JSON interactions - used to ensure the integrity of interactions between the devices and the IoT Agent |
| DUMMY_DEVICES_TRANSPORT | `HTTP` | The transport protocol used by the dummy IoT devices |
| DUMMY_DEVICES_PAYLOAD | `JSON` | The payload format used by the dummy IoT devices |
| IOTA_JSON_LD_CONTEXT | `http://context/ngsi-context.jsonld` | The location of the `@context` file used to define the device data models |
| IOTA_JSON_LD_CONTEXT | `http://context/user-context.jsonld` | The location of the `@context` file used to define the device data models |

The other `tutorial` container configuration values described in the YAML file are not used in this tutorial.

Expand Down Expand Up @@ -316,7 +316,7 @@ iot-agent:
- IOTA_HTTP_PORT=7896
- IOTA_PROVIDER_URL=http://iot-agent:4041
- IOTA_DEFAULT_RESOURCE=/iot/json
- IOTA_JSON_LD_CONTEXT=http://context/ngsi-context.jsonld
- IOTA_JSON_LD_CONTEXT=http://context/user-context.jsonld
- IOTA_FALLBACK_TENANT=openiot
- IOTA_MULTI_CORE=true
```
Expand Down Expand Up @@ -345,7 +345,7 @@ The `iot-agent` container is driven by environment variables as shown:
| IOTA_MONGO_DB | `iotagentul` | The name of the database used in mongoDB |
| IOTA_HTTP_PORT | `7896` | The port where the IoT Agent listens for IoT device traffic over HTTP |
| IOTA_PROVIDER_URL | `http://iot-agent:4041` | URL passed to the Context Broker when commands are registered, used as a forwarding URL location when the Context Broker issues a command to a device |
| IOTA_JSON_LD_CONTEXT | `http://context/ngsi-context.jsonld` | The location of the `@context` file used to define the device data models |
| IOTA_JSON_LD_CONTEXT | `http://context/user-context.jsonld` | The location of the `@context` file used to define the device data models |
| IOTA_FALLBACK_TENANT | `openiot` | The tenant to use if no explicit tenant has been received from communications |

# Prerequisites
Expand Down Expand Up @@ -712,7 +712,7 @@ curl -G -iX GET 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:te
```json
{
"@context": [
"http://context/ngsi-context.jsonld",
"http://context/user-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.7.jsonld"
],
"id": "urn:ngsi-ld:Device:temperature001",
Expand Down Expand Up @@ -766,7 +766,7 @@ curl -L -X GET 'http://localhost:1026/ngsi-ld/v1/entities/?type=Device' \
[
{
"@context": [
"http://context/ngsi-context.jsonld",
"http://context/user-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.7.jsonld"
],
"id": "urn:ngsi-ld:Device:motion003",
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/common.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ services:
- TWITTER_CONSUMER_KEY=<ADD_YOUR_CONSUMER_KEY>
- TWITTER_CONSUMER_SECRET=<ADD_YOUR_CONSUMER_SECRET>
- MONGO_URL=mongodb://mongo-db:27017
- IOTA_JSON_LD_CONTEXT=http://context/ngsi-context.jsonld
- IOTA_JSON_LD_CONTEXT=http://context/user-context.jsonld
- MOVE_TRACTOR=-1


Expand Down
2 changes: 1 addition & 1 deletion services
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SCORPIO="http://scorpio:9090/scorpio/"
ORION="http://orion:1026/version"
IOT_AGENT="http://iot-agent:4041/version"
STELLIO="http://localhost:8080/actuator/health"
CONTEXT="http://context/ngsi-context.jsonld"
CONTEXT="http://context/user-context.jsonld"
CORE_CONTEXT="https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"

dockerCmd="docker compose"
Expand Down

0 comments on commit 4b8bbcc

Please sign in to comment.