Adding support for archiver schema and label fields

Author: arlake228

psconfig/perfsonar-psconfig/doc/psconfig-schema.json

@@ -356,7 +356,9 @@
                 "data": { "$ref": "#/pSConfig/AnyJSON" },
                 "transform": { "$ref": "#/pSConfig/ArchiveJQTransformSpecification" },
                 "ttl": { "$ref": "#/pSConfig/Duration" },
-                "_meta": { "$ref": "#/pSConfig/AnyJSON" }
+                "_meta": { "$ref": "#/pSConfig/AnyJSON" },
+                "label": { "type": "string" },
+                "schema": { "$ref": "#/pSConfig/Cardinal" }
             },
             "additionalProperties": false,
             "required": [ "archiver", "data"]

psconfig/perfsonar-psconfig/psconfig/client/psconfig/archive.py

@@ -32,7 +32,17 @@ def ttl(self, val=None):
         '''Gets/sets ttl'''
 
         return self._field_duration('ttl', val)
-    
+
+    def label(self, val=None):
+        '''Gets/sets label'''
+
+        return self._field('label', val)
+
+    def schema(self, val=None):
+        '''Gets/sets schema'''
+
+        return self._field_cardinal('schema', val)
+
     def validate(self):
         '''Validates archive against JSON schema. Returns list of errors. Will be empty list if no
             errors.'''

psconfig/perfsonar-psconfig/psconfig/client/psconfig/schema.py

@@ -364,7 +364,9 @@ def psconfig_json_schema(self):
                         "data": { "$ref": "#/pSConfig/AnyJSON" },
                         "transform": { "$ref": "#/pSConfig/ArchiveJQTransformSpecification" },
                         "ttl": { "$ref": "#/pSConfig/Duration" },
-                        "_meta": { "$ref": "#/pSConfig/AnyJSON" }
+                        "_meta": { "$ref": "#/pSConfig/AnyJSON" },
+                        "label": { "type": "string" },
+                        "schema": { "$ref": "#/pSConfig/Cardinal" }
                     },
                     "additionalProperties": False,
                     "required": [ "archiver", "data"]