using ycb module now, and support for base descriptor file.

aiqin · Jan 11, 2013 · d47a24a · d47a24a
1 parent 4b44a47
commit d47a24a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 471 deletions.
diff --git a/config/descriptor-schema.json b/config/descriptor-schema.json
@@ -4,6 +4,7 @@
     "properties" : {
         "name" : { "type" : "string", "required" :true },
         "commonlib" : { "type" : "string"},
+        "extends" : { "type" : "string"},
         "startProxyServer" : { "type" : "boolean"},
         "routerProxyConfig" : { "type" : "string"},
         "config" : {

diff --git a/lib/util/dataprovider.js b/lib/util/dataprovider.js
@@ -11,7 +11,7 @@ var os = require('os');
 var fs = require("fs");
 var qs = require('querystring');
 var JSV = require("JSV").JSV;
-var ycb = require('../util/ycb');
+var ycb = require('ycb');
 
 function DataProvider(config, testDataPath) {
     this.logger = log4js.getLogger("DataProvider");
@@ -47,6 +47,13 @@ DataProvider.prototype.getTestData = function () {
         }
     }
 
+    //checking if descriptor is extending another json
+    console.log(descriptorJson)
+    if ( descriptorJson[0].extends ) {
+         baseJson = JSON.parse(fs.readFileSync(descriptorJson[0].extends));
+         descriptorJson = descriptorJson.concat(baseJson);
+    }
+
     // merge dimension into descriptor
     dimensionsJson = JSON.parse(fs.readFileSync(this.dimensions, "utf-8"));
     descriptorJson.unshift(dimensionsJson[0]);