Merge pull request #78 from nikhil1290/master

Fixing data types in xsd
GlobalNOC · Nov 2, 2015 · bc6b9ed · bc6b9ed
2 parents aae0719 + 461b8b1
commit bc6b9ed
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/etc/SciPass.xsd b/etc/SciPass.xsd
@@ -21,10 +21,10 @@
                             </xs:complexType>
                           </xs:element>
                         </xs:sequence>
-                        <xs:attribute type="xs:byte" name="of_port_id" use="required"/>
+                        <xs:attribute type="xs:int" name="of_port_id" use="required"/>
                         <xs:attribute type="xs:string" name="type" use="required"/>
-                        <xs:attribute type="xs:string" name="name" use="required"/>
-                        <xs:attribute type="xs:string" name="description" use="required"/>
+                        <xs:attribute type="xs:string" name="name" use="optional"/>
+                        <xs:attribute type="xs:string" name="description" use="optional"/>
                       </xs:complexType>
                     </xs:element>
                     <xs:element name="sensor_group" maxOccurs="unbounded" minOccurs="0">
@@ -34,7 +34,7 @@
                             <xs:complexType>
                               <xs:simpleContent>
                                 <xs:extension base="xs:string">
-                                  <xs:attribute type="xs:byte" name="of_port_id" use="required"/>
+                                  <xs:attribute type="xs:int" name="of_port_id" use="required"/>
                                   <xs:attribute type="xs:string" name="sensor_id" use="required"/>
                                 </xs:extension>
                               </xs:simpleContent>
@@ -52,17 +52,17 @@
                   <xs:attribute type="xs:string" name="name" use="optional"/>
                   <xs:attribute type="xs:string" name="mode" use="required"/>
                   <xs:attribute type="xs:string" name="admin_status" use="required"/>
-                  <xs:attribute type="xs:byte" name="least_specific_prefix_len" use="required"/>
-                  <xs:attribute type="xs:byte" name="most_specific_prefix_len" use="required"/>
-                  <xs:attribute type="xs:short" name="blacklist_priority" use="optional"/>
-                  <xs:attribute type="xs:short" name="whitelist_priority" use="optional"/>
+                  <xs:attribute type="xs:int" name="least_specific_prefix_len" use="required"/>
+                  <xs:attribute type="xs:int" name="most_specific_prefix_len" use="required"/>
+                  <xs:attribute type="xs:int" name="blacklist_priority" use="optional"/>
+                  <xs:attribute type="xs:int" name="whitelist_priority" use="optional"/>
 		  <xs:attribute type="xs:string" name="ignore_sensor_load" use="optional"/>
                   <xs:attribute type="xs:float" name="sensor_min_load_threshold" use="optional"/>
                   <xs:attribute type="xs:float" name="sensor_load_delta_threshold" use="optional"/>
-                  <xs:attribute type="xs:short" name="max_prefixes" use="required"/>
-                  <xs:attribute type="xs:short" name="max_flow_count" use="required"/>
-                  <xs:attribute type="xs:byte" name="idle_timeout" use="optional"/>
-                  <xs:attribute type="xs:short" name="hard_timeout" use="optional"/>
+                  <xs:attribute type="xs:int" name="max_prefixes" use="required"/>
+                  <xs:attribute type="xs:int" name="max_flow_count" use="required"/>
+                  <xs:attribute type="xs:int" name="idle_timeout" use="optional"/>
+                  <xs:attribute type="xs:int" name="hard_timeout" use="optional"/>
                 </xs:complexType>
               </xs:element>
             </xs:sequence>