rsmp_schemer 0.3.2 → 0.4.2

data/schemas/core_3.1.4/schema/core/alarm.json

@@ -9,22 +9,26 @@
     "aSp" : {
       "description" : "Alarm message variant",
       "type" : "string",
-      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume" ]
+      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume",
+                 "issue", "acknowledge", "suspend", "resume" ]
     },
     "ack" : {
       "description" : "Acknowledgement",
       "type" : "string",
-      "enum" : [ "Acknowledged", "notAcknowledged" ]
+      "enum" : [ "Acknowledged", "notAcknowledged",
+                 "acknowledged", "NotAcknowledged" ]
     },
     "aS" : {
       "description" : "Status",
       "type" : "string",
-      "enum" : [ "inActive", "Active" ]
+      "enum" : [ "inActive", "Active",
+                 "InActive", "active" ]
     },
     "sS" : {
       "description" : "Suspended",
       "type" : "string",
-      "enum" : [ "suspended", "notSuspended" ]
+      "enum" : [ "suspended", "notSuspended",
+                 "Suspended", "NotSuspended" ]
     },
     "aTs" : { "$ref": "definitions.json#/timestamp" },
     "cat" : {

data/schemas/core_3.1.4/spec/core/alarm_spec.rb

@@ -89,6 +89,21 @@ RSpec.describe "Traffic Light Controller RSMP SXL Schema validation" do
 	  ])
 	end
 
+  it 'accept states with first letter in lowercase' do
+		invalid = message.dup
+		invalid['aSp'] = "issue"
+	  expect( validate(invalid) ).to be_nil
+
+		invalid['aSp'] = "acknowledge"
+	  expect( validate(invalid) ).to be_nil
+
+		invalid['aSp'] = "suspend"
+	  expect( validate(invalid) ).to be_nil
+
+		invalid['aSp'] = "resume"
+	  expect( validate(invalid) ).to be_nil
+	end
+
   it 'catches wrong state type' do
 		invalid = message.dup
 		invalid['aSp'] = 123

data/schemas/core_3.1.4/spec/core/version_spec.rb

@@ -10,9 +10,10 @@ RSpec.describe "Traffic Light Controller RSMP SXL Schema validation" do
 	    { "vers" => "3.1.1" },
 	    { "vers" => "3.1.2" },
 	    { "vers" => "3.1.3" },
-	    { "vers" => "3.1.4" }
+	    { "vers" => "3.1.4" },
+	    { "vers" => "3.1.5" }
 	  ],
-	  "SXL" => "1.1"
+	  "SXL" => "1.0.15"
 	}}
 
 	it 'accepts valid message' do

data/schemas/core_3.1.5/.gitignore

@@ -0,0 +1 @@
+.DS_Store

data/schemas/core_3.1.5/schema/core/alarm.json

@@ -7,49 +7,48 @@
     "aCId" : { "$ref": "definitions.json#/alarm_code" },
     "xACId" : { "description" : "External alarm code id", "type" : "string" },
     "aSp" : {
-      "description" : "Alarm message variant",
+      "description" : "Alarm specialization",
       "type" : "string",
-      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume", "Request" ]
-    },
-    "ack" : {
-      "description" : "Acknowledgement",
-      "type" : "string",
-      "enum" : [ "Acknowledged", "notAcknowledged" ]
-    },
-    "aS" : {
-      "description" : "Status",
-      "type" : "string",
-      "enum" : [ "inActive", "Active" ]
-    },
-    "sS" : {
-      "description" : "Suspended",
-      "type" : "string",
-      "enum" : [ "suspended", "notSuspended" ]
-    },
-    "aTs" : { "$ref": "definitions.json#/timestamp" },
-    "cat" : {
-      "description" : "Category",
-      "type" : "string",
-      "enum" : [ "T", "D" ]
+      "enum" : [ "Issue", "Acknowledge", "Suspend", "Resume", "Request",
+                 "issue", "acknowledge", "suspend", "resume", "request" ]
+    }
+  },
+  "required" : [ "aSp"],
+  "allOf" : [
+    {
+      "if": {
+        "required" : [ "aSp" ],
+        "properties" : { "aSp" : { "const" : "Issue" } }
+      },
+      "then": { "$ref": "alarm_issue.json" }
     },
-    "pri" : {
-      "description" : "Priority",
-      "type" : "string",
-      "enum" : [ "1", "2", "3" ]
+    {
+      "if": {
+        "allOf" : [
+          {
+            "required" : [ "aSp" ],
+            "properties" : {
+              "aSp" : { "enum" : [ "Suspend","Resume",
+                                   "suspend", "resume"]  }
+            }
+          },
+          {
+            "not": { "required" : [ "sS" ] }
+          }
+        ]
+      },
+      "then": { "$ref": "alarm_suspend_resume.json" }
     },
-    "rvs" : {
-      "description" : "Return values",
-      "type" : "array",
-      "items" : {
-        "type" : "object",
-        "properties": {
-          "n" : { "description" : "Unique reference of the value", "type" : "string" },
-          "v" : { "description" : "Value", "type" : "string" }
-        },
-        "required" : [ "n", "v" ],
-        "additionProperties": false
-      }
+    {
+      "if": {
+        "required" : [ "aSp", "sS" ],
+        "properties" : {
+          "aSp" : { "const" : "Suspend" },
+          "sS" : { "enum" : [ "suspended", "notSuspended",
+                              "Suspended", "NotSuspended" ] }
+        }
+      },
+      "then": { "$ref": "alarm_suspended_resumed.json" }
     }
-  },
-  "required" : [ "mId", "cId", "aCId", "xACId", "aSp", "ack", "aS", "aTs", "sS", "cat", "pri", "rvs" ]
+  ]
 }

data/schemas/core_3.1.5/schema/core/alarm_issue.json

@@ -0,0 +1,44 @@
+{
+  "properties" : {
+    "ack" : {
+      "description" : "Acknowledgement",
+      "type" : "string",
+      "enum" : [ "Acknowledged", "notAcknowledged" ]
+    },
+    "aS" : {
+      "description" : "Active status",
+      "type" : "string",
+      "enum" : [ "inActive", "Active" ]
+    },
+    "sS" : {
+      "description" : "Suspend status",
+      "type" : "string",
+      "enum" : [ "suspended", "notSuspended" ]
+    },
+    "aTs" : { "$ref": "definitions.json#/timestamp" },
+    "cat" : {
+      "description" : "Category",
+      "type" : "string",
+      "enum" : [ "T", "D" ]
+    },
+    "pri" : {
+      "description" : "Priority",
+      "type" : "string",
+      "enum" : [ "1", "2", "3" ]
+    },
+    "rvs" : {
+      "description" : "Return values",
+      "type" : "array",
+      "items" : {
+        "type" : "object",
+        "properties": {
+          "n" : { "description" : "Unique reference of the value", "type" : "string" },
+          "v" : { "description" : "Value", "type" : "string" }
+        },
+        "required" : [ "n", "v" ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required" : [ "mId", "cId", "aCId", "xACId", "aSp", "ack", "aS", "aTs", "sS", "cat", "pri", "rvs" ]
+}

data/schemas/core_3.1.5/schema/core/alarm_suspend_resume.json

@@ -0,0 +1,3 @@
+{
+  "required" : [ "mId", "cId", "aCId", "xACId", "aSp" ]
+}

data/schemas/core_3.1.5/schema/core/alarm_suspended_resumed.json

@@ -0,0 +1,47 @@
+{
+  "properties" : {
+    "ack" : {
+      "description" : "Acknowledgement",
+      "type" : "string",
+      "enum" : [ "Acknowledged", "notAcknowledged",
+                 "acknowledged", "NotAcknowledged" ]
+    },
+    "aS" : {
+      "description" : "Active status",
+      "type" : "string",
+      "enum" : [ "inActive", "Active",
+                 "InActive", "active" ]
+    },
+    "sS" : {
+      "description" : "Suspend status",
+      "type" : "string",
+      "enum" : [ "suspended", "notSuspended",
+                 "Suspended", "NotSuspended" ]
+    },
+    "aTs" : { "$ref": "definitions.json#/timestamp" },
+    "cat" : {
+      "description" : "Category",
+      "type" : "string",
+      "enum" : [ "T", "D" ]
+    },
+    "pri" : {
+      "description" : "Priority",
+      "type" : "string",
+      "enum" : [ "1", "2", "3" ]
+    },
+    "rvs" : {
+      "description" : "Return values",
+      "type" : "array",
+      "items" : {
+        "type" : "object",
+        "properties": {
+          "n" : { "description" : "Unique reference of the value", "type" : "string" },
+          "v" : { "description" : "Value", "type" : "string" }
+        },
+        "required" : [ "n", "v" ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required" : [ "mId", "cId", "aCId", "xACId", "aSp", "ack", "aS", "aTs", "sS", "cat", "pri", "rvs" ]
+}

data/schemas/core_3.1.5/schema/core/command_response.json

@@ -26,7 +26,7 @@
           }
         },
         "required" : [ "cCI", "n", "v", "age" ],
-        "additionProperties": false
+        "additionalProperties": false
       }
     }
   },

data/schemas/core_3.1.5/schema/core/status_response.json

@@ -22,7 +22,7 @@
         }
         },
         "required" : [ "sCI", "n", "s", "q" ],
-        "additionProperties": false
+        "additionalProperties": false
       }
     }
   },

data/schemas/core_3.1.5/schema/core/status_update.json

@@ -22,7 +22,7 @@
         }
         },
         "required" : [ "sCI", "n", "s", "q" ],
-        "additionProperties": false
+        "additionalProperties": false
       }
     }
   },

data/schemas/core_3.1.5/spec/core/alarm_issue_spec.rb

@@ -0,0 +1,299 @@
+RSpec.describe "Traffic Light Controller RSMP SXL Schema validation" do
+	describe 'Alarm Issue' do
+		let(:message) {{
+			"mType" => "rSMsg",
+			"type" => "Alarm",
+			"mId" => "E68A0010-C336-41ac-BD58-5C80A72C7092",
+			"cId" => "AB+84001=860SG001",
+			"aCId" => "A0001",
+			"xACId" => "Serious lamp error",
+			"aSp" => "Issue",
+			"ack" => "notAcknowledged",
+			"aS" => "Active",
+			"sS" => "notSuspended",
+			"aTs" => "2009-10-01T11:59:31.571Z",
+			"cat" => "D",
+			"pri" => "2",
+			"rvs" => [
+				{
+					"n" => "color",
+					"v" => "red"
+				}
+			]
+		}}
+
+		it 'accepts valid alarm' do
+			expect( validate(message) ).to be_nil
+		end
+
+		it 'catches missing component id' do
+			invalid = message.dup
+			invalid.delete 'cId'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["cId"]}]
+			])
+		end
+
+		it 'catches missing alarm code id' do
+			invalid = message.dup
+			invalid.delete 'aCId'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["aCId"]}]
+			])
+		end
+
+		it 'catches bad alarm code id' do
+			invalid = message.dup
+			invalid['aCId'] = "001"
+			expect( validate(invalid) ).to eq([
+				["/aCId", "pattern"]
+			])
+		end
+
+		it 'catches wrong alarm code id type' do
+			invalid = message.dup
+			invalid['aCId'] = 123
+			expect( validate(invalid) ).to eq([
+				["/aCId", "string"]
+			])
+		end
+
+		it 'catches missing extended alarm code id' do
+			invalid = message.dup
+			invalid.delete 'xACId'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["xACId"]}]
+			])
+		end
+
+		it 'catches wrong extended alarm code id type' do
+			invalid = message.dup
+			invalid['xACId'] = 123
+			expect( validate(invalid) ).to eq([
+				["/xACId", "string"]
+			])
+		end
+
+		it 'catches missing specialization' do
+			invalid = message.dup
+			invalid.delete 'aSp'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["aSp"]}]
+			])
+		end
+
+		it 'catches bad specialization' do
+			invalid = message.dup
+			invalid['aSp'] = "Bad"
+			expect( validate(invalid) ).to eq([
+				["/aSp", "enum"]
+			])
+		end
+
+		it 'catches wrong specialization type' do
+			invalid = message.dup
+			invalid['aSp'] = 123
+			expect( validate(invalid) ).to eq([
+				["/aSp", "enum"],
+				["/aSp", "string"]
+			])
+		end
+
+		it 'catches missing alarm active status' do
+			invalid = message.dup
+			invalid.delete 'aS'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["aS"]}]
+			])
+		end
+
+		it 'catches bad alarm active status' do
+			invalid = message.dup
+			invalid['aS'] = "Bad"
+			expect( validate(invalid) ).to eq([
+				["/aS", "enum"]
+			])
+		end
+
+		it 'catches wrong alarm active status' do
+			invalid = message.dup
+			invalid['aS'] = 123
+			expect( validate(invalid) ).to eq([
+				["/aS", "enum"],
+				["/aS", "string"]
+			])
+		end
+
+		it 'catches missing alarm suspend status' do
+			invalid = message.dup
+			invalid.delete 'sS'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["sS"]}]
+			])
+		end
+
+		it 'catches bad alarm code id' do
+			invalid = message.dup
+			invalid['sS'] = "Bad"
+			expect( validate(invalid) ).to eq([
+				["/sS", "enum"]
+			])
+		end
+
+		it 'catches wrong alarm code id type' do
+			invalid = message.dup
+			invalid['sS'] = 123
+			expect( validate(invalid) ).to eq([
+				["/sS", "enum"],
+				["/sS", "string"]
+			])
+		end
+
+		it 'catches missing alarm code id' do
+			invalid = message.dup
+			invalid.delete 'ack'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["ack"]}]
+			])
+		end
+
+		it 'catches bad alarm code id' do
+			invalid = message.dup
+			invalid['ack'] = "Bad"
+			expect( validate(invalid) ).to eq([
+				["/ack", "enum"]
+			])
+		end
+
+		it 'catches wrong alarm code id type' do
+			invalid = message.dup
+			invalid['ack'] = 123
+			expect( validate(invalid) ).to eq([
+				["/ack", "enum"],
+				["/ack", "string"]
+			])
+		end
+
+		it 'catches missing category' do
+			invalid = message.dup
+			invalid.delete 'cat'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["cat"]}]
+			])
+		end
+
+		it 'catches bad category' do
+			invalid = message.dup
+			invalid['cat'] = "A"
+			expect( validate(invalid) ).to eq([
+				["/cat", "enum"]
+			])
+		end
+
+		it 'catches wrong category' do
+			invalid = message.dup
+			invalid['cat'] = 123
+			expect( validate(invalid) ).to eq([
+				["/cat", "enum"],
+				["/cat", "string"]
+			])
+		end
+
+		it 'catches missing priority' do
+			invalid = message.dup
+			invalid.delete 'pri'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["pri"]}]
+			])
+		end
+
+		it 'catches bad priority' do
+			invalid = message.dup
+			invalid['pri'] = "4"
+			expect( validate(invalid) ).to eq([
+				["/pri", "enum"]
+			])
+		end
+
+		it 'catches wrong priority' do
+			invalid = message.dup
+			invalid['pri'] = 1
+			expect( validate(invalid) ).to eq([
+				["/pri", "enum"],
+				["/pri", "string"]
+			])
+		end
+
+		it 'catches missing timestamp' do
+			invalid = message.dup
+			invalid.delete 'aTs'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["aTs"]}]
+			])
+		end
+
+		it 'catches bad timestamp' do
+			invalid = message.dup
+			invalid['aTs'] = "yesterday"
+			expect( validate(invalid) ).to eq([
+				["/aTs", "pattern"]
+			])
+		end
+
+		it 'catches wrong timestamp type' do
+			invalid = message.dup
+			invalid['aTs'] = 123
+			expect( validate(invalid) ).to eq([
+				["/aTs", "string"]
+			])
+		end
+
+		it 'catches missing rvs' do
+			invalid = message.dup
+			invalid.delete 'rvs'
+			expect( validate(invalid) ).to eq([
+				["", "required", {"missing_keys"=>["rvs"]}]
+			])
+		end
+
+		it 'catches bad rvs type' do
+			invalid = message.dup
+			invalid["rvs"] = {}
+			expect( validate(invalid) ).to eq([
+				["/rvs", "array"]
+			])
+		end
+
+		it 'catches missing alarm name' do
+			invalid = message.dup
+			invalid["rvs"].first.delete 'n'
+			expect( validate(invalid) ).to eq([
+				["/rvs/0", "required", {"missing_keys"=>["n"]}]
+			])
+		end
+
+		it 'catches bad alarm name' do
+			invalid = message.dup
+			invalid["rvs"].first['n'] = 3
+			expect( validate(invalid) ).to eq([
+				["/rvs/0/n", "string"]
+			])
+		end
+
+		it 'catches missing alarm value' do
+			invalid = message.dup
+			invalid["rvs"].first.delete 'v'
+			expect( validate(invalid) ).to eq([
+				["/rvs/0", "required", {"missing_keys"=>["v"]}]
+			])
+		end
+
+		it 'catches bad alarm value' do
+			invalid = message.dup
+			invalid["rvs"].first['v'] = 3
+			expect( validate(invalid) ).to eq([
+				["/rvs/0/v", "string"]
+			])
+		end
+	end
+end

data/schemas/core_3.1.5/spec/core/alarm_resume_spec.rb

@@ -0,0 +1,93 @@
+RSpec.describe "Traffic Light Controller RSMP SXL Schema validation" do
+	describe 'Alarm Resume' do
+		let(:message) {{
+			"mType" => "rSMsg",
+			"type" => "Alarm",
+			"mId" => "2a744145-403a-423f-ba80-f38e283a778e",
+			"ntsOId" => "",
+			"xNId" => "",
+			"cId" => "AB+84001=860VA001",
+			"aCId" => "A0004",
+			"xACId" => "",
+			"xNACId" => "",
+			"aSp" => "Resume"
+		}}
+
+	  it 'accepts valid alarm resume' do
+		  expect( validate(message) ).to be_nil
+	  end
+
+	  it 'catches missing component id' do
+			invalid = message.dup
+			invalid.delete 'cId'
+		  expect( validate(invalid) ).to eq([
+		  	["", "required", {"missing_keys"=>["cId"]}]
+		  ])
+	  end
+
+	  it 'catches missing alarm code id' do
+			invalid = message.dup
+			invalid.delete 'aCId'
+		  expect( validate(invalid) ).to eq([
+		  	["", "required", {"missing_keys"=>["aCId"]}]
+		  ])
+	  end
+
+	  it 'catches bad alarm code id' do
+			invalid = message.dup
+			invalid['aCId'] = "001"
+		  expect( validate(invalid) ).to eq([
+		  	["/aCId", "pattern"]
+		  ])
+		end
+
+	  it 'catches wrong alarm code id type' do
+			invalid = message.dup
+			invalid['aCId'] = 123
+		  expect( validate(invalid) ).to eq([
+		  	["/aCId", "string"]
+		  ])
+	  end
+
+	  it 'catches missing extended alarm code id' do
+			invalid = message.dup
+			invalid.delete 'xACId'
+		  expect( validate(invalid) ).to eq([
+		  	["", "required", {"missing_keys"=>["xACId"]}]
+		  ])
+	  end
+
+	  it 'catches wrong extended alarm code id type' do
+			invalid = message.dup
+			invalid['xACId'] = 123
+		  expect( validate(invalid) ).to eq([
+		  	["/xACId", "string"]
+		  ])
+	  end
+
+	  it 'catches missing specialization' do
+			invalid = message.dup
+			invalid.delete 'aSp'
+		  expect( validate(invalid) ).to eq([
+		  	["", "required", {"missing_keys"=>["aSp"]}]
+		  ])
+	  end
+
+	  it 'catches bad specialization' do
+			invalid = message.dup
+			invalid['aSp'] = "Bad"
+		  expect( validate(invalid) ).to eq([
+		  	["/aSp", "enum"]
+		  ])
+		end
+
+	  it 'catches wrong specialization type' do
+			invalid = message.dup
+			invalid['aSp'] = 123
+		  expect( validate(invalid) ).to eq([
+		  	["/aSp", "enum"],
+		  	["/aSp", "string"]
+		  ])
+	  end
+	end
+end