Refs #100984 Add schemas and validation examples for StrategySelection.

ProjectCCNx · Aug 23, 2013 · c3b3c15 · c3b3c15
1 parent 18f25d2
commit c3b3c15
Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/doc/technical/Registration.txt b/doc/technical/Registration.txt
@@ -252,7 +252,7 @@ already addressed the appropriate node).
 PublisherPublicKeyDigest is always present in a response.
 
 === StrategyID
-Is a strategy identifier.
+Is a strategy identifier.  Present in responses and in `setstrategy` requests.
 It is limited to 15 characters, chosen from the set of characters that are
 legal in a c language identifier.
 
@@ -262,6 +262,7 @@ procedure.
 The format of this string may differ by strategy, but it is recommended that
 a form similar to the query portion of a URI be used.
 Documentation for individual strategies should specify what this string may contain.
+May be present in responses and in `setstrategy` requests.
 
 === FreshnessSeconds
 FreshnessSeconds is optional in a request.

diff --git a/schema/ccnx.dtd b/schema/ccnx.dtd
@@ -207,6 +207,16 @@
 
 <!ELEMENT ForwardingFlags (#PCDATA)>	<!-- nonNegativeInteger -->
 
+<!ELEMENT StrategySelection (Action?,
+                             Name?,
+                             PublisherPublicKeyDigest?,
+                             StrategyID?,
+                             StrategyParameters?,
+                             FreshnessSeconds?)>
+
+<!ELEMENT StrategyID         (#PCDATA)>	<!-- string, 1-15 alpha_numeric -->
+<!ELEMENT StrategyParameters (#PCDATA)>	<!-- string -->
+
 <!ELEMENT StatusResponse (StatusCode, StatusText?)>
 <!ELEMENT StatusCode (#PCDATA)>	<!-- nonNegativeInteger -->
 <!ELEMENT StatusText (#PCDATA)>	<!-- textual description of error or other condition -->
diff --git a/schema/ccnx.xsd b/schema/ccnx.xsd
@@ -391,6 +391,18 @@
   </xs:sequence>
 </xs:complexType>
 
+<xs:element name="StrategySelection" type="StrategySelectionType"/>
+<xs:complexType name="StrategySelectionType">
+    <xs:sequence>
+        <xs:element name="Action" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="Name" type="NameType" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="PublisherPublicKeyDigest" type="DigestType" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="StrategyID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="StrategyParameters" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="FreshnessSeconds" type="xs:nonNegativeInteger" minOccurs="0" maxOccurs="1"/>
+    </xs:sequence>
+</xs:complexType>
+
 <xs:complexType name="StatusResponseType">
   <xs:sequence>
       <xs:element name="StatusCode" type="xs:nonNegativeInteger" minOccurs="1" maxOccurs="1"/>

diff --git a/schema/validation/ccn-test23.xml b/schema/validation/ccn-test23.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<StrategySelection>
+  <Action>setstrategy</Action>
+  <Name>
+    <Component ccnbencoding="base64Binary">VGhpc0lzUGFydE9mVGhlTmFtZQ==</Component>
+  </Name>
+  <PublisherPublicKeyDigest ccnbencoding="base64Binary">
+  AwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM=
+  </PublisherPublicKeyDigest>
+  <StrategyID>random</StrategyID>
+  <StrategyParameters>a=42</StrategyParameters>
+  <FreshnessSeconds>9999999</FreshnessSeconds>
+</StrategySelection>