Merge pull request #3 from go-lab/iss2/modify_metadata_examples

Wissam-Halimi · Wissam-Halimi · commit 96d762b11410 · 2015-01-20T11:50:28.000+01:00
Modify metadta to new updates. Closes #2
diff --git a/examples/actuator-calls.json b/examples/actuator-calls.json
@@ -29,6 +29,7 @@
                 {
                     "name": "left",
                     "unit": "radian",
+                    "type": "float",
                     "rangeMinimum": 0.00,
                     "rangeMaximum": 3.14,
                     "rangeStep": 0.10,
@@ -38,6 +39,7 @@
                 {
                     "name": "right",
                     "unit": "radian",
+                    "type": "float",
                     "rangeMinimum": 0.00,
                     "rangeMaximum": 3.14,
                     "rangeStep": 0.10,
diff --git a/examples/sensor-calls.json b/examples/sensor-calls.json
@@ -26,6 +26,7 @@
                 {
                     "name": "X",
                     "unit": "cm",
+                    "type": "float",
                     "lastMeasured": "2014-06-23T18:25:43.511Z",
                     "rangeMinimum": 0.00,
                     "rangeMaximum": 100.00,
@@ -35,6 +36,7 @@
                 {
                     "name": "Y",
                     "unit": "cm",
+                    "type": "float",
                     "lastMeasured": "2014-06-23T18:25:43.511Z",
                     "rangeMinimum": 0.00,
                     "rangeMaximum": 100.00,
@@ -44,6 +46,7 @@
                 {
                     "name": "Z",
                     "unit": "cm",
+                    "type": "float",
                     "lastMeasured": "2014-06-23T18:25:43.511Z",
                     "rangeMinimum": 0.00,
                     "rangeMaximum": 100.00,
@@ -74,6 +77,7 @@
             "values": [
                 {
                     "name": "front",
+                    "type": "string",
                     "lastMeasured": "2014-06-23T18:28:43.617Z",
                     "updateFrequency": 10
                 }
diff --git a/red-lab/examples/actuator-calls.json b/red-lab/examples/actuator-calls.json
@@ -28,6 +28,7 @@
                     {
                         "name": "angularRef",
                         "unit": "degree",
+                        "type": "float",
                         "rangeMinimum": 30,
                         "rangeMaximum": 330
                     }
diff --git a/red-lab/examples/sensor-calls.json b/red-lab/examples/sensor-calls.json
@@ -27,6 +27,7 @@
                     {
                         "name": "angularPosition",
                         "unit": "degree",
+                        "type": "string",
                         "lastMeasured": "2014-06-23T18:25:43.511Z",
                         "rangeMinimum": 30,
                         "rangeMaximum": 330,
@@ -49,6 +50,7 @@
                 "values": [
                     {
                         "name": "video",
+                        "type": "string",
                         "lastMeasured": "2014-06-23T18:28:43.617Z",
                         "updateFrequency": 10
                     }
diff --git a/red-lab/metadata.json b/red-lab/metadata.json
@@ -328,6 +328,25 @@
                 "unit": {
                     "type": "string"
                 },
+                "type": {
+                    "type": "string",
+                    "description": "The data type of that this configuration parameters expects, e.g. number or string",
+                    "enum": [
+                        "integer",
+                        "long",
+                        "float",
+                        "double",
+                        "string",
+                        "byte",
+                        "boolean",
+                        "date",
+                        "dateTime",
+                        "object",           /* extended Swagger with JSON object type */
+                        "array",
+                        "any",              /* extended Swagger with any type -- this represents any possible type */
+                        "binary"            /* extended Swagger with binary type -- support for large binary config files */
+                    ]
+                },
                 "rangeMinimum": {
                     "type": "number",
                     "format": "double"
diff --git a/spec/metadata.json b/spec/metadata.json
@@ -384,6 +384,25 @@
                 "unit": {
                     "type": "string"
                 },
+                "type": {
+                    "type": "string",
+                    "description": "The data type of that this configuration parameters expects, e.g. number or string",
+                    "enum": [
+                        "integer",
+                        "long",
+                        "float",
+                        "double",
+                        "string",
+                        "byte",
+                        "boolean",
+                        "date",
+                        "dateTime",
+                        "object",           /* extended Swagger with JSON object type */
+                        "array",
+                        "any",              /* extended Swagger with any type -- this represents any possible type */
+                        "binary"            /* extended Swagger with binary type -- support for large binary config files */
+                    ]
+                },
                 "rangeMinimum": {
                     "type": "number",
                     "format": "double"

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`{`
`27`	`27`	`"name": "X",`
`28`	`28`	`"unit": "cm",`
	`29`	`+ "type": "float",`
`29`	`30`	`"lastMeasured": "2014-06-23T18:25:43.511Z",`
`30`	`31`	`"rangeMinimum": 0.00,`
`31`	`32`	`"rangeMaximum": 100.00,`
`@@ -35,6 +36,7 @@`
`35`	`36`	`{`
`36`	`37`	`"name": "Y",`
`37`	`38`	`"unit": "cm",`
	`39`	`+ "type": "float",`
`38`	`40`	`"lastMeasured": "2014-06-23T18:25:43.511Z",`
`39`	`41`	`"rangeMinimum": 0.00,`
`40`	`42`	`"rangeMaximum": 100.00,`
`@@ -44,6 +46,7 @@`
`44`	`46`	`{`
`45`	`47`	`"name": "Z",`
`46`	`48`	`"unit": "cm",`
	`49`	`+ "type": "float",`
`47`	`50`	`"lastMeasured": "2014-06-23T18:25:43.511Z",`
`48`	`51`	`"rangeMinimum": 0.00,`
`49`	`52`	`"rangeMaximum": 100.00,`
`@@ -74,6 +77,7 @@`
`74`	`77`	`"values": [`
`75`	`78`	`{`
`76`	`79`	`"name": "front",`
	`80`	`+ "type": "string",`
`77`	`81`	`"lastMeasured": "2014-06-23T18:28:43.617Z",`
`78`	`82`	`"updateFrequency": 10`
`79`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`{`
`29`	`29`	`"name": "angularRef",`
`30`	`30`	`"unit": "degree",`
	`31`	`+ "type": "float",`
`31`	`32`	`"rangeMinimum": 30,`
`32`	`33`	`"rangeMaximum": 330`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`{`
`28`	`28`	`"name": "angularPosition",`
`29`	`29`	`"unit": "degree",`
	`30`	`+ "type": "string",`
`30`	`31`	`"lastMeasured": "2014-06-23T18:25:43.511Z",`
`31`	`32`	`"rangeMinimum": 30,`
`32`	`33`	`"rangeMaximum": 330,`
`@@ -49,6 +50,7 @@`
`49`	`50`	`"values": [`
`50`	`51`	`{`
`51`	`52`	`"name": "video",`
	`53`	`+ "type": "string",`
`52`	`54`	`"lastMeasured": "2014-06-23T18:28:43.617Z",`
`53`	`55`	`"updateFrequency": 10`
`54`	`56`	`}`