Test AppBrickInstanceDetails.

Author: martacarbone

internal/orchestrator/bricks/bricks_test.go

@@ -75,13 +75,15 @@ func TestBrickCreate(t *testing.T) {
 		require.Nil(t, paths.New("testdata/dummy-app").CopyDirTo(tempDummyApp))
 
 		req := BrickCreateUpdateRequest{ID: "arduino:dbstorage_sqlstore"}
-		err = brickService.BrickCreate(req, f.Must(app.Load(tempDummyApp.String())))
+		before := f.Must(app.Load(tempDummyApp.String()))
+		err = brickService.BrickCreate(req, before)
 		require.Nil(t, err)
 		after, err := app.Load(tempDummyApp.String())
 		require.Nil(t, err)
-		require.Len(t, after.Descriptor.Bricks, 2)
-		require.Equal(t, "arduino:dbstorage_sqlstore", after.Descriptor.Bricks[1].ID)
+		requireBricksSizeUpdatedBy(t, before.Descriptor, after.Descriptor, 1)
+		requireBricksContain(t, after.Descriptor, "arduino:dbstorage_sqlstore")
 	})
+
 	t.Run("the variables of a brick are updated", func(t *testing.T) {
 		tempDummyApp := paths.New("testdata/dummy-app.brick-override.temp")
 		err := tempDummyApp.RemoveAll()
@@ -102,13 +104,14 @@ func TestBrickCreate(t *testing.T) {
 			},
 		}
 
-		err = brickService.BrickCreate(req, f.Must(app.Load(tempDummyApp.String())))
+		before := f.Must(app.Load(tempDummyApp.String()))
+		err = brickService.BrickCreate(req, before)
 		require.Nil(t, err)
 
 		after, err := app.Load(tempDummyApp.String())
 		require.Nil(t, err)
-		require.Len(t, after.Descriptor.Bricks, 1)
-		require.Equal(t, "arduino:arduino_cloud", after.Descriptor.Bricks[0].ID)
+		requireBricksSizeUpdatedBy(t, before.Descriptor, after.Descriptor, 0)
+		requireBricksContain(t, after.Descriptor, "arduino:arduino_cloud")
 		require.Equal(t, deviceID, after.Descriptor.Bricks[0].Variables["ARDUINO_DEVICE_ID"])
 		require.Equal(t, secret, after.Descriptor.Bricks[0].Variables["ARDUINO_SECRET"])
 	})
@@ -256,28 +259,51 @@ func TestBrickCreateWithModulesUpdate(t *testing.T) {
 	}
 }
 
-/*
-	t.Run("add a brick to an App", func(t *testing.T) {
-		dummyApp := appDummySetup(t)
+func TestAppBrickInstanceDetails(t *testing.T) {
+	bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(paths.New("testdata"))
+	require.Nil(t, err)
+	modelsIndex, err := modelsindex.GenerateModelsIndexFromFile(paths.New("testdata"))
+	require.Nil(t, err)
+	brickService := NewService(modelsIndex, bricksIndex, nil)
 
-		model := "glass-breaking"
-		req := BrickCreateUpdateRequest{
-			ID:        "arduino:audio_classification",
-			Variables: nil,
-			Model:     &model,
-		}
+	tests := []struct {
+		name                 string
+		brickId              string
+		expectedErrorMessage string
+		expectedModelId      string
+	}{
+		{
+			name:                 "details for a brick defined in the app",
+			brickId:              "arduino:video_object_detection",
+			expectedErrorMessage: "",
+			expectedModelId:      "yolox-object-detection",
+		},
 
-		// act
-		err = brickService.BrickCreate(req, f.Must(app.Load(dummyApp.String())))
-		require.Nil(t, err)
+		{
+			name:                 "details should be not available for a brick not defined in the app",
+			brickId:              "arduino:audio_classification",
+			expectedErrorMessage: "brick arduino:audio_classification not added in the app",
+		},
 
-		// assert
-		after, err := app.Load(dummyApp.String())
-		require.Nil(t, err)
-		require.Len(t, after.Descriptor.Bricks, 2)
-		require.Equal(t, "arduino:audio_classification", after.Descriptor.Bricks[1].ID)
-	})
-*/
+		{
+			name:                 "details for a not exitent brick",
+			brickId:              "arduino:notExistentBrick",
+			expectedErrorMessage: "brick not found",
+		},
+	}
+
+	for _, tt := range tests {
+		dummyApp := appDummySetup(t)
+		ymlApp := f.Must(app.Load(dummyApp.String()))
+		brickInstance, err := brickService.AppBrickInstanceDetails(&ymlApp, tt.brickId)
+		if err == nil {
+			require.Equal(t, tt.brickId, brickInstance.ID)
+			require.Equal(t, tt.expectedModelId, brickInstance.ModelID)
+		} else {
+			require.Equal(t, tt.expectedErrorMessage, err.Error())
+		}
+	}
+}
 
 func appDummySetup(t *testing.T) *paths.Path {
 	tempDummyApp := paths.New("testdata/dummy-app.temp")
@@ -286,3 +312,21 @@ func appDummySetup(t *testing.T) *paths.Path {
 	require.Nil(t, paths.New("testdata/dummy-app").CopyDirTo(tempDummyApp))
 	return tempDummyApp
 }
+
+func requireBricksSizeUpdatedBy(t *testing.T, before app.AppDescriptor, after app.AppDescriptor, value int) {
+	require.Len(t, after.Bricks, len(before.Bricks)+value)
+}
+
+// getBrickIndexByBrickId searches the Bricks slice within the AppDescriptor
+// for a Brick whose ID matches the provided brickId.
+func getBrickIndexByBrickId(application app.AppDescriptor, brickId string) int {
+	idx := slices.IndexFunc(application.Bricks, func(b app.Brick) bool {
+		return brickId == b.ID
+	})
+	return idx
+}
+
+func requireBricksContain(t *testing.T, application app.AppDescriptor, brickID string) {
+	idx := getBrickIndexByBrickId(application, brickID)
+	require.NotEqual(t, idx, -1)
+}

internal/orchestrator/bricks/testdata/bricks-list.yaml

@@ -31,3 +31,13 @@ bricks:
   require_devices: false
   category: audio
   model_name: glass-breaking
+- id: arduino:video_object_detection
+  name: Video Object Detection
+  description: This object analyze video streams from a camera.
+  require_container: true
+  require_model: true
+  require_devices: true
+  mount_devices_into_container: true
+  ports: []
+  category: null
+  model_name: yolox-object-detection

internal/orchestrator/bricks/testdata/dummy-app/app.yaml

@@ -3,4 +3,5 @@ description: Control the LED from the Arduino IoT Cloud using RPC calls
 icon: ☁️
 ports: []
 bricks:
-- arduino:arduino_cloud:
+- arduino:arduino_cloud:
+- arduino:video_object_detection:

internal/orchestrator/bricks/testdata/models-list.yaml

@@ -7,3 +7,13 @@ models:
       "EI_AUDIO_CLASSIFICATION_MODEL": "/models/ootb/ei/glass-breaking.eim"
     bricks:
     - arduino:audio_classification
+ - face-detection:
+    runner: brick
+    name : "Lightweight-Face-Detection"
+    description: "Face bounding box detection. This model is trained on the WIDER FACE dataset and can detect faces in images."
+    model_configuration:
+      "EI_OBJ_DETECTION_MODEL": "/models/ootb/ei/lw-face-det.eim"
+    model_labels: 
+      - face
+    bricks:
+      - arduino:object_detection