Merge "Change cperf apex deploy to use odl_l3-nofeature-noha"

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index c934d19..237f894 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -32,11 +32,11 @@
             <<: *master
         - baremetal:
             slave-label: compass-baremetal
-            os-version: 'trusty'
+            os-version: 'xenial'
             <<: *danube
         - virtual:
             slave-label: compass-virtual
-            os-version: 'trusty'
+            os-version: 'xenial'
             <<: *danube
 #--------------------------------
 #        master
@@ -323,27 +323,27 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-danube-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 9 * * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-baremetal-danube-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 13 * * *'
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-baremetal-danube-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 17 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-danube-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 21 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-baremetal-danube-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 1 * * *'
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-baremetal-danube-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 5 * * *'
 - trigger:
     name: 'compass-os-onos-sfc-ha-baremetal-danube-trigger'
     triggers:

diff --git a/utils/test/vnfcatalogue/helpers/migrate.js b/utils/test/vnfcatalogue/helpers/migrate.js
index ec20905..63ee9c0 100644 (file)
--- a/utils/test/vnfcatalogue/helpers/migrate.js
+++ b/utils/test/vnfcatalogue/helpers/migrate.js
@@ -28,6 +28,14 @@ function createTable(tableName) {
         if (Schema[tableName][key].type === 'text' && Schema[tableName][key].hasOwnProperty('fieldtype')) {
         column = table[Schema[tableName][key].type](key, Schema[tableName][key].fieldtype);
         }
+        else if (Schema[tableName][key].type === 'enum' && Schema[tableName][key].hasOwnProperty('values') && Schema[tableName][key].nullable === true) {
+        console.log(Schema[tableName][key].values);
+        column = table[Schema[tableName][key].type](key, Schema[tableName][key].values).nullable();
+        }
+        else if (Schema[tableName][key].type === 'enum' && Schema[tableName][key].hasOwnProperty('values')) {
+        console.log(Schema[tableName][key].values);
+        column = table[Schema[tableName][key].type](key, Schema[tableName][key].values).notNullable();
+        }
         else if (Schema[tableName][key].type === 'string' && Schema[tableName][key].hasOwnProperty('maxlength')) {
         column = table[Schema[tableName][key].type](key, Schema[tableName][key].maxlength);
         }

diff --git a/utils/test/vnfcatalogue/helpers/schema.js b/utils/test/vnfcatalogue/helpers/schema.js
index 2aaf99a..4a7559a 100644 (file)
--- a/utils/test/vnfcatalogue/helpers/schema.js
+++ b/utils/test/vnfcatalogue/helpers/schema.js
@@ -31,10 +31,16 @@ var Schema = {
         lines_of_code: {type: 'integer', nullable: true, unsigned: true},
         versions: {type: 'integer', nullable: true, unsigned: true},
         no_of_developers: {type: 'integer', nullable: true, unsigned: true},
+        no_of_stars: {type: 'integer', nullable: true, unsigned: true},
+        license: {type: 'enum', nullable: false, values: ['MIT', 'GPL', 'GPL_V2', 'BSD', 'APACHE']},
+        opnfv_indicator: {type: 'enum', nullable: false, values: ['gold', 'silver', 'platinum']},
+        complexity: {type: 'enum', nullable: true, values: ['low', 'medium', 'high']},
+        activity: {type: 'enum', nullable: true, values: ['low', 'medium', 'high']},
+        last_updated: {type: 'dateTime', nullable: true},
     },
     tag: {
         tag_id: {type: 'increments', nullable: false, primary: true},
-        name: {type: 'string', maxlength: 150, nullable: false}
+        tag_name: {type: 'string', maxlength: 150, nullable: false}
     },
     vnf_tags: {
         vnf_tag_id: {type: 'increments', nullable: false, primary: true},