restructure (probably needs more changes, let's see what the workflow…

…s think)
eclipse-ibeji · Mar 18, 2024 · 51a9952 · 51a9952
1 parent f208373
commit 51a9952
Show file tree

Hide file tree

Showing 31 changed files with 5 additions and 93 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@
 # The default resolver for workspaces is different than for regular packages, so use v2 to avoid warnings
 resolver = "2"
 members = [
-    "cloud_connectors/azure/mqtt_connector",
+    "cloud_connectors/mqtt_connector",
     "freyja_apps/e2e",
     "freyja_apps/ibeji_integration",
     "freyja_apps/in_memory",

diff --git a/cloud_connectors/azure/Dockerfile.dt_connector.amd64 b/cloud_connectors/azure/Dockerfile.dt_connector.amd64
diff --git a/cloud_connectors/azure/Dockerfile.dt_connector.arm64 b/cloud_connectors/azure/Dockerfile.dt_connector.arm64
diff --git a/cloud_connectors/azure/container/scripts/container_startup.sh b/cloud_connectors/azure/container/scripts/container_startup.sh
diff --git a/...onnectors/azure/mqtt_connector/Cargo.toml → cloud_connectors/mqtt_connector/Cargo.toml b/...onnectors/azure/mqtt_connector/Cargo.toml → cloud_connectors/mqtt_connector/Cargo.toml
diff --git a/...connectors/azure/mqtt_connector/README.md → cloud_connectors/mqtt_connector/README.md b/...connectors/azure/mqtt_connector/README.md → cloud_connectors/mqtt_connector/README.md
@@ -86,8 +86,6 @@ The steps below will guide you on manually deploying the Azure Digital Twins res
 
 #### Automated Deployment
 
-Before starting this section, please view [Prerequisites for Automated Deployment of Azure Resources](../README.md#prerequisites-for-automated-deployment-of-azure-resources).
-
 1. Sign in with Azure CLI. Follow the prompts after entering the following command.
 
 ```shell

diff --git a/..._connectors/azure/mqtt_connector/build.rs → cloud_connectors/mqtt_connector/build.rs b/..._connectors/azure/mqtt_connector/build.rs → cloud_connectors/mqtt_connector/build.rs
diff --git a/...t_connector/res/mqtt_config.template.json → ...t_connector/res/mqtt_config.template.json b/...t_connector/res/mqtt_config.template.json → ...t_connector/res/mqtt_config.template.json
diff --git a/...nnectors/azure/mqtt_connector/src/main.rs → cloud_connectors/mqtt_connector/src/main.rs b/...nnectors/azure/mqtt_connector/src/main.rs → cloud_connectors/mqtt_connector/src/main.rs
diff --git a/...zure/mqtt_connector/src/mqtt_connector.rs → ...tors/mqtt_connector/src/mqtt_connector.rs b/...zure/mqtt_connector/src/mqtt_connector.rs → ...tors/mqtt_connector/src/mqtt_connector.rs
diff --git a/...tt_connector/src/mqtt_connector_config.rs → ...tt_connector/src/mqtt_connector_config.rs b/...tt_connector/src/mqtt_connector_config.rs → ...tt_connector/src/mqtt_connector_config.rs
diff --git a/cloud_connectors/azure/.globalconfig → cloud_connectors/resources/.globalconfig b/cloud_connectors/azure/.globalconfig → cloud_connectors/resources/.globalconfig
diff --git a/...nector/azure_function/src/function.csproj → ...ources/azure_function/src/function.csproj b/...nector/azure_function/src/function.csproj → ...ources/azure_function/src/function.csproj
diff --git a/...onnector/azure_function/src/function.json → ...esources/azure_function/src/function.json b/...onnector/azure_function/src/function.json → ...esources/azure_function/src/function.json
diff --git a/...tt_connector/azure_function/src/host.json → ...rs/resources/azure_function/src/host.json b/...tt_connector/azure_function/src/host.json → ...rs/resources/azure_function/src/host.json
diff --git a/...or/azure_function/src/local.settings.json → ...es/azure_function/src/local.settings.json b/...or/azure_function/src/local.settings.json → ...es/azure_function/src/local.settings.json
diff --git a/.../mqtt_connector/azure_function/src/run.cs → ...ctors/resources/azure_function/src/run.cs b/.../mqtt_connector/azure_function/src/run.cs → ...ctors/resources/azure_function/src/run.cs
diff --git a/...tests/MQTTConnectorAzureFunction.Tests.cs → ...tests/MQTTConnectorAzureFunction.Tests.cs b/...tests/MQTTConnectorAzureFunction.Tests.cs → ...tests/MQTTConnectorAzureFunction.Tests.cs
diff --git a/...s/MQTTConnectorAzureFunction.Tests.csproj → ...s/MQTTConnectorAzureFunction.Tests.csproj b/...s/MQTTConnectorAzureFunction.Tests.csproj → ...s/MQTTConnectorAzureFunction.Tests.csproj
diff --git a/cloud_connectors/azure/sample-dtdl/hvac.json → ...onnectors/resources/sample-dtdl/hvac.json b/cloud_connectors/azure/sample-dtdl/hvac.json → ...onnectors/resources/sample-dtdl/hvac.json
diff --git a/cloud_connectors/azure/sample-dtdl/obd.json → ...connectors/resources/sample-dtdl/obd.json b/cloud_connectors/azure/sample-dtdl/obd.json → ...connectors/resources/sample-dtdl/obd.json
diff --git a/...connectors/azure/sample-dtdl/trailer.json → ...ectors/resources/sample-dtdl/trailer.json b/...connectors/azure/sample-dtdl/trailer.json → ...ectors/resources/sample-dtdl/trailer.json
diff --git a/...connectors/azure/sample-dtdl/vehicle.json → ...ectors/resources/sample-dtdl/vehicle.json b/...connectors/azure/sample-dtdl/vehicle.json → ...ectors/resources/sample-dtdl/vehicle.json
diff --git a/...tors/azure/scripts/digital_twins_setup.sh → .../resources/scripts/digital_twins_setup.sh b/...tors/azure/scripts/digital_twins_setup.sh → .../resources/scripts/digital_twins_setup.sh
diff --git a/...ipts/digital_twins_setup_smart_trailer.sh → ...ipts/digital_twins_setup_smart_trailer.sh b/...ipts/digital_twins_setup_smart_trailer.sh → ...ipts/digital_twins_setup_smart_trailer.sh
diff --git a/...ors/azure/scripts/mqtt_connector_setup.sh → ...resources/scripts/mqtt_connector_setup.sh b/...ors/azure/scripts/mqtt_connector_setup.sh → ...resources/scripts/mqtt_connector_setup.sh
diff --git a/...cripts/mqtt_connector_setup.template.json → ...cripts/mqtt_connector_setup.template.json b/...cripts/mqtt_connector_setup.template.json → ...cripts/mqtt_connector_setup.template.json
diff --git a/container/README.md b/container/README.md
@@ -25,17 +25,7 @@ information on how to build and run supported applications in a container.
 
 ### Freyja Cloud Connectors
 
-To containerize the
-[Azure Digitals Twin Cloud Connector](../cloud_connectors/azure/digital_twins_connector/README.md)
-use one of the following dockerfiles:
-
-- [cloud_connectors/azure/Dockerfile.dt_connector.amd64](../cloud_connectors/azure/Dockerfile.dt_connector.amd64) -
-For x86-64 architecture.
-- [cloud_connectors/azure/Dockerfile.dt_connector.arm64](../cloud_connectors/azure/Dockerfile.dt_connector.arm64) -
-For aarch64 architecture.
-
-See [Docker Containers](#docker-containers) or [Podman Containers](#podman-containers) for
-information on how to build and run supported applications in a container.
+The sample cloud connectors do not currently support containerization.
 
 ## Configuration Overrides
 

diff --git a/freyja_apps/e2e/README.md b/freyja_apps/e2e/README.md
@@ -1,6 +1,6 @@
 # End-To-End Freyja Example Application
 
-This Freyja Example Application utilizes the [Ibeji Digital Twin Adapter](https://github.com/eclipse-ibeji/freyja/tree/main/adapters/digital_twin/ibeji_adapter/) and the [Standard GRPC Cloud Adapter](https://github.com/eclipse-ibeji/freyja/tree/main/adapters/cloud/grpc_cloud_adapter/) to show a minimal end-to-end example of how to sync data from the vehicle to the cloud.
+This Freyja Example Application utilizes the [Standard GRPC Digital Twin Adapter](https://github.com/eclipse-ibeji/freyja/tree/main/adapters/digital_twin/grpc_digital_twin_adapter/) configured to connect to Ibeji and the [Standard GRPC Cloud Adapter](https://github.com/eclipse-ibeji/freyja/tree/main/adapters/cloud/grpc_cloud_adapter/) to show a minimal end-to-end example of how to sync data from the vehicle to the cloud.
 
 ## Build and Run
 

diff --git a/freyja_apps/ibeji_integration/README.md b/freyja_apps/ibeji_integration/README.md
@@ -1,6 +1,6 @@
 # Freyja-Ibeji Integration Example Application
 
-This Freyja Example Application utilizes the [Ibeji Digital Twin Adapter](https://github.com/eclipse-ibeji/freyja/tree/main/adapters/digital_twin/ibeji_adapter) and an in-memory mock cloud connector adapter to show a minimal connected local example of how to retrieve data from the vehicle.
+This Freyja Example Application utilizes the [Standard GRPC Digital Twin Adapter](https://github.com/eclipse-ibeji/freyja/tree/main/adapters/digital_twin/grpc_digital_twin_adapter/) configured to connect to Ibeji, as well as the in-memory mock mapping service and cloud connector adapter to show a minimal connected local example of how to retrieve data from the vehicle.
 
 ## Build and Run
 

diff --git a/freyja_apps/template/README.md b/freyja_apps/template/README.md
@@ -7,7 +7,7 @@ This is a template for creating a Freyja application. For more information about
 To create your own Freyja application, you can copy this template and make the following changes:
 
 1. Choose the adapters to use. Freyja requires users to select a Cloud Adapter, a Digital Twin Adapter, a Mapping Adapter, at least one Data Adapter Factory, and at least one Service Discovery Adapter. Some potential choices are:
-    1. Freyja-provided adapters. These are enumerated in [Appendix A of the Freyja quickstart documentation](https://github.com/eclipse-ibeji/freyja/blob/main/docs/tutorials/quickstart.md#appendix-a).
+    1. Freyja-provided adapters. These are enumerated in [Appendix A of the Freyja custom adapters documentation](https://github.com/eclipse-ibeji/freyja/blob/main/docs/tutorials/custom-adapters.md#appendix-a).
     1. A custom adapter implementation. For more information on how to write and use these, see the see the [Freyja custom adapter documentation](https://github.com/eclipse-ibeji/freyja/blob/main/docs/tutorials/custom-adapters.md).
 1. Edit `Cargo.template.toml`:
     1. Add dependencies for the package(s) you need for your adapters. You can implement adapters in the same crate and import their dependencies here, or you can implement them in separate crates and import those.