Merge pull request telefonicaid#839 from jason-fox/feature/add-v2-metadata

fgalan · web-flow · commit 09048b9f0a79 · 2020-02-11T18:23:03.000+01:00
Add NGSIv2 metadata support to attributeAlias plugin
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,4 +1,5 @@
 Refresh Documentation
 Add NGSIv2 metadata support to device provisioned attributes
 Fix: Error message when sending measures with unknown/undefined attribute
-Add Null check within executeWithSecurity() to avoid crash (#829)
+Add Null check within executeWithSecurity() to avoid crash (#829)
+Add NGSIv2 metadata support to attributeAlias plugin.
diff --git a/lib/plugins/attributeAlias.js b/lib/plugins/attributeAlias.js
@@ -37,9 +37,9 @@ var config = require('../commonConfig'),
 
 function extractSingleMapping(previous, current) {
     /* jshint camelcase: false */
-
     previous.direct[current.object_id] = current.name;
     previous.types[current.object_id] = current.type;
+    previous.metadata[current.object_id] = current.metadata;
     previous.inverse[current.name] = current.object_id; // collision using multientity
     return previous;
 }
@@ -51,7 +51,7 @@ function extractSingleMapping(previous, current) {
  * @return {{direct: {}, inverse: {}}}      Object containing the direct and reverse name mappings.
  */
 function extractAllMappings(typeInformation) {
-    var mappings = { direct: {}, inverse: {}, types: {}};
+    var mappings = { direct: {}, inverse: {}, types: {}, metadata: {}};
 
     if (typeInformation.active) {
         mappings = typeInformation.active.reduce(extractSingleMapping, mappings);
@@ -64,7 +64,6 @@ function extractAllMappings(typeInformation) {
     if (typeInformation.commands) {
         mappings = typeInformation.commands.reduce(extractSingleMapping, mappings);
     }
-
     return mappings;
 }
 
@@ -81,10 +80,10 @@ function applyAlias(mappings) {
                 /*jshint camelcase: false */
                 attribute.object_id = attribute.name; // inverse not usefull due to collision
             }
+            attribute.metadata = mappings.metadata[attribute.name];
             attribute.type = mappings.types[attribute.name];
             attribute.name = mappings.direct[attribute.name];
         }
-
         return attribute;
     };
 }
diff --git a/test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin1.json b/test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin1.json
@@ -1,10 +1,18 @@
 {
   "temperature": {
-    "type": "centigrades",
-    "value": "52"
+    "type":"Number",
+    "value":52,
+    "metadata": {
+      "type":"Property",
+      "value":"CEL"
+    }
   },
   "pressure": {
-    "type": "Hgmm",
-    "value": "20071103T131805"
+    "type":"Number",
+    "value":20071103,
+    "metadata": {
+      "type":"Property",
+      "value":"Hgmm"
+    }
   }
 }
diff --git a/test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin2.json b/test/unit/ngsiv2/examples/contextRequests/updateContextAliasPlugin2.json
@@ -1,6 +1,10 @@
 {
   "luminance": {
-    "type": "lumens",
-    "value": "9"
+    "type": "Number",
+    "value": 9,
+    "metadata": {
+      "type":"Property",
+      "value":"CAL"
+    }
   }
 }
diff --git a/test/unit/ngsiv2/plugins/alias-plugin_test.js b/test/unit/ngsiv2/plugins/alias-plugin_test.js
@@ -50,19 +50,25 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),
                     {
                         object_id: 't',
                         name: 'temperature',
-                        type: 'centigrades'
+                        type: 'Number',
+                        metadata: { type: 'Property', value:'CEL'}
+
                     }
                 ],
                 active: [
                     {
                         object_id: 'p',
                         name: 'pressure',
-                        type: 'Hgmm'
+                        type: 'Number',
+                        metadata: { type: 'Property', value:'Hgmm'}
+
                     },
                     {
                         object_id: 'l',
                         name: 'luminance',
-                        type: 'lumens'
+                        type: 'Number',
+                        metadata: { type: 'Property', value:'CAL'}
+
                     },
                     {
                         object_id: 'ut',

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ var config = require('../commonConfig'),`
`37`	`37`
`38`	`38`	`function extractSingleMapping(previous, current) {`
`39`	`39`	`/* jshint camelcase: false */`
`40`		`-`
`41`	`40`	`previous.direct[current.object_id] = current.name;`
`42`	`41`	`previous.types[current.object_id] = current.type;`
	`42`	`+ previous.metadata[current.object_id] = current.metadata;`
`43`	`43`	`previous.inverse[current.name] = current.object_id; // collision using multientity`
`44`	`44`	`return previous;`
`45`	`45`	`}`
`@@ -51,7 +51,7 @@ function extractSingleMapping(previous, current) {`
`51`	`51`	`* @return {{direct: {}, inverse: {}}} Object containing the direct and reverse name mappings.`
`52`	`52`	`*/`
`53`	`53`	`function extractAllMappings(typeInformation) {`
`54`		`- var mappings = { direct: {}, inverse: {}, types: {}};`
	`54`	`+ var mappings = { direct: {}, inverse: {}, types: {}, metadata: {}};`
`55`	`55`
`56`	`56`	`if (typeInformation.active) {`
`57`	`57`	`mappings = typeInformation.active.reduce(extractSingleMapping, mappings);`
`@@ -64,7 +64,6 @@ function extractAllMappings(typeInformation) {`
`64`	`64`	`if (typeInformation.commands) {`
`65`	`65`	`mappings = typeInformation.commands.reduce(extractSingleMapping, mappings);`
`66`	`66`	`}`
`67`		`-`
`68`	`67`	`return mappings;`
`69`	`68`	`}`
`70`	`69`
`@@ -81,10 +80,10 @@ function applyAlias(mappings) {`
`81`	`80`	`/jshint camelcase: false /`
`82`	`81`	`attribute.object_id = attribute.name; // inverse not usefull due to collision`
`83`	`82`	`}`
	`83`	`+ attribute.metadata = mappings.metadata[attribute.name];`
`84`	`84`	`attribute.type = mappings.types[attribute.name];`
`85`	`85`	`attribute.name = mappings.direct[attribute.name];`
`86`	`86`	`}`
`87`		`-`
`88`	`87`	`return attribute;`
`89`	`88`	`};`
`90`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"luminance": {`
`3`		`- "type": "lumens",`
`4`		`- "value": "9"`
	`3`	`+ "type": "Number",`
	`4`	`+ "value": 9,`
	`5`	`+ "metadata": {`
	`6`	`+ "type":"Property",`
	`7`	`+ "value":"CAL"`
	`8`	`+ }`
`5`	`9`	`}`
`6`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,19 +50,25 @@ var iotAgentLib = require('../../../../lib/fiware-iotagent-lib'),`
`50`	`50`	`{`
`51`	`51`	`object_id: 't',`
`52`	`52`	`name: 'temperature',`
`53`		`- type: 'centigrades'`
	`53`	`+ type: 'Number',`
	`54`	`+ metadata: { type: 'Property', value:'CEL'}`
	`55`	`+`
`54`	`56`	`}`
`55`	`57`	`],`
`56`	`58`	`active: [`
`57`	`59`	`{`
`58`	`60`	`object_id: 'p',`
`59`	`61`	`name: 'pressure',`
`60`		`- type: 'Hgmm'`
	`62`	`+ type: 'Number',`
	`63`	`+ metadata: { type: 'Property', value:'Hgmm'}`
	`64`	`+`
`61`	`65`	`},`
`62`	`66`	`{`
`63`	`67`	`object_id: 'l',`
`64`	`68`	`name: 'luminance',`
`65`		`- type: 'lumens'`
	`69`	`+ type: 'Number',`
	`70`	`+ metadata: { type: 'Property', value:'CAL'}`
	`71`	`+`
`66`	`72`	`},`
`67`	`73`	`{`
`68`	`74`	`object_id: 'ut',`