Merge pull request #945 from Green-Software-Foundation/time-sync-aggr…

…egation Time sync aggregation parameters resolution
Green-Software-Foundation · Aug 8, 2024 · f6b58b7 · f6b58b7
2 parents eef1183 + 50dfb9e
commit f6b58b7
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 424 deletions.
diff --git a/manifests/examples/pipelines/outputs-if-diff/pipeline-with-mocks.yaml b/manifests/examples/pipelines/outputs-if-diff/pipeline-with-mocks.yaml
@@ -261,20 +261,6 @@ initialize:
             unit: none
             description: Synced time
             aggregation-method: none
-    group-by:
-      path: builtin
-      method: GroupBy
-      parameter-metadata:
-        inputs:
-          group:
-            unit: none
-            description: Group by fields
-            aggregation-method: none
-        outputs:
-          grouped-data:
-            unit: none
-            description: Grouped data
-            aggregation-method: none
 execution:
   command: >-
     /Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
@@ -327,7 +313,7 @@ tree:
           - mock-observations
         regroup:
           - cloud/region
-          - instance-type
+          - cloud/instance-type
         compute:
           - interpolate
           - cpu-factor-to-wattage
@@ -681,7 +667,7 @@ tree:
           - mock-observations
         regroup:
           - cloud/region
-          - instance-type
+          - cloud/instance-type
         compute:
           - interpolate
           - cpu-factor-to-wattage

diff --git a/manifests/examples/pipelines/pipeline-with-aggregate.yml b/manifests/examples/pipelines/pipeline-with-aggregate.yml
@@ -158,33 +158,6 @@ initialize:
         end-time: "2023-12-12T00:01:00.000Z"
         interval: 5
         allow-padding: true
-      parameter-metadata:
-        inputs:
-          timestamp:
-            unit: RFC3339
-            description: refers to the time of occurrence of the input
-            aggregation-method: none
-          duration:
-            unit: seconds
-            description: refers to the duration of the input
-            aggregation-method: sum
-          cloud/instance-type:
-            unit: none
-            description: type of Cloud Instance name used in the cloud provider APIs
-            aggregation-method: none
-          cloud/region:
-            unit: none
-            description: region cloud instance
-            aggregation-method: none
-          time-reserved:
-            unit: seconds
-            description: time reserved for a component
-            aggregation-method: avg
-        outputs:
-          synced-time:
-            unit: none
-            description: Synced time
-            aggregation-method: none
 tree:
   children:
     child-1:

diff --git a/src/__tests__/if-run/builtins/time-sync.test.ts b/src/__tests__/if-run/builtins/time-sync.test.ts
@@ -456,12 +456,10 @@ describe('execute(): ', () => {
       {
         timestamp: '2023-12-12T00:00:00.000Z',
         duration: 1,
-        'cpu/utilization': 10,
       },
       {
         timestamp: '2023-12-12T00:00:01.000Z',
         duration: 1,
-        'cpu/utilization': 10,
       },
     ];
 
@@ -566,17 +564,14 @@ describe('execute(): ', () => {
       },
     ]);
 
-    /**In each 5 second interval, 60% of the time cpu/utilization = 10, 40% of the time it is 0, so cpu/utilization in the averaged result be 6 */
     const expectedResult = [
       {
         timestamp: '2023-12-12T00:00:00.000Z',
         duration: 5,
-        'resources-total': 10,
       },
       {
         timestamp: '2023-12-12T00:00:05.000Z',
         duration: 5,
-        'resources-total': 10,
       },
     ];