Feature/ibms

.travis.yml

@@ -30,6 +30,7 @@ before_deploy:
    if ! [ "$BEFORE_DEPLOY_RUN" ]; then
      export BEFORE_DEPLOY_RUN=1;
      ./extra/make-docs.sh;
+     ./extra/make-deb.sh;
    fi
 
 deploy:

data/templates/cisco-catalog-version.py

@@ -8,7 +8,13 @@ def main():
     data = {}
 
     try:
-        data = json.loads(clid('show version'))
+        # get the version in json form in a temporary string so we can manipulate it
+        dataString = clid('show version')
+        # The "as is" in the license header string from 'show version'
+        # will cause json.dumps within taskrunner.py to produce an invalid json string
+        # This is resolved by replacing the additional escapes (\) with a raw string
+        dataString = dataString.replace("\\\"as is,\\\"", "as is")
+        data = json.loads(dataString)
     except:
         pass
 

data/templates/get_driveid.js

@@ -80,7 +80,7 @@ function parseDriveWwid(idList) {
 	//Only IDE and SCSI disk will be retrieved
     var scsiLines = [], sataLines = [], wwnLines = [], usbLines = [], requiredStrLen = 60;
     lines.forEach(function(line){
-        if ( line && !(line.match('part')) && line.match(/sd[a-z]$|hd[a-z]$/i)){
+        if ( line && !(line.match('part')) && line.match(/[sh]d[a-z]?[a-z]$/i)){
             var nameIndex = line.lastIndexOf('/'), idIndex = line.lastIndexOf('->');
             if (line.indexOf('scsi') === 0) {
                 scsiLines.push([line.slice(nameIndex + 1), line.slice(0, idIndex)]);

data/templates/remove_bmc_credentials.sh

@@ -2,7 +2,26 @@
 
 usernames=(<%= users.join(" ") %>)
 
-mapfile -t userlist < <(ipmitool user list)
+channel=''
+function set_channel()
+{
+    for i in {1..15}; do
+        ipmitool user list $i &>/dev/null
+        status=$?
+        if [ "$status" -eq "0" ] ; then
+            channel=$i
+            break
+        fi
+    done
+}
+set_channel
+echo "channel number is" $channel
+if [ -z "${channel}" ]; then
+ echo "Channel number was not set correctly, exiting script"
+exit 1
+fi
+
+mapfile -t userlist < <(ipmitool user list $channel)
 
 array_len=${#userlist[@]}
 if [ "$array_len" -gt  "1" ]; then
@@ -22,4 +41,6 @@ for user in ${usernames[@]}; do
       fi
    done
 done
+#succesfull
+exit 0
 

data/templates/set_bmc_credentials.sh

@@ -21,9 +21,11 @@ fi
 echo " Getting the user list"
 cmdReturn=$(ipmitool user list $channel)
 myarray=(${cmdReturn//$'\n'/ })
-cmdReturn1=$(ipmitool user summary $channel)
-myarray1=(${cmdReturn1//$'\n'/ })
-userNumber=${myarray1[8]}
+mapfile -t userlist < <(ipmitool user list $channel)
+userNumber=${#userlist[@]}
+if [ "$userNumber" -gt  "1" ]; then
+   userNumber=$(expr $userNumber - 1)
+fi
 user=$(<%=user%>)
 #The check variable is a flag to determine if the user already exists
 #(1:already exist and 0:user does not exist)

data/templates/unattend_server2012.xml

@@ -147,7 +147,7 @@
             <ComputerName><%=hostname%></ComputerName>
         </component>
         <component name="Microsoft-Windows-TCPIP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <% if( undefined !== networkDevices ) { %>
+            <% if( typeof networkDevices !== 'undefined' ) { %>
             <% networkDevices.forEach(function(n) { %>
             <% cidr_bits = 0 %>
             <% dhcp_ipv4 = false %>

data/views/hook.2.0.json

@@ -0,0 +1,10 @@
+{
+    "url": "<%=url%>", 
+    "id": "<%=id%>",
+    <% if (typeof name !== "undefined") {%>
+    "name": "<%=name%>",
+    <% } %>
+    "filters": <%- JSON.stringify(filters)%>
+}
+
+

data/views/redfish-1.0/redfish.1.0.0.computersystem.1.0.0.json

@@ -16,7 +16,7 @@
     "UUID": "<%= ohai.data.dmi.system.uuid.toLowerCase() %>",
     "HostName": "",
     "IndicatorLED": "<%= chassisData.uid %>",
-    "PowerState": "<%= chassisData.power %>",
+    "PowerState": "<%= chassisData.power==='Unknown' ? 'On' : chassisData.power %>",
     "Boot": {},
     "BiosVersion": "<%= ohai.data.dmi.bios.version.trim() %> <%= ohai.data.dmi.bios.bios_revision.trim() %> <%= ohai.data.dmi.bios.release_date.trim() %>",
     "ProcessorSummary": {

data/views/redfish-1.0/redfish.1.0.0.jsonschemafile.1.0.0.json

@@ -2,6 +2,7 @@
   "@odata.context" : "<%= basepath %>/$metadata/Schemas/Members/$entity",
   "@odata.id": "<%= url %>",
   "@odata.type": "#JsonSchemaFile.1.0.0.JsonSchemaFile",
+  "Name": "",
   "Description": "Schema Definition File for <%= identifier  %>",
   "Id": "<%= identifier  %>",
   "Languages": [

data/views/redfish-1.0/redfish.1.0.0.processor.1.0.0.json

@@ -4,6 +4,7 @@
     "@odata.type": "#Processor.1.0.0.Processor",
     "Oem" : {},
     "Id": "<%=socketId%>",
+    "Name": "",
     "Socket": "<%= dmi.data['Processor Information'][socketId]['Socket Designation'] %>",
     "ProcessorType": "CPU",
     "ProcessorArchitecture": "x86",

data/views/redfish-1.0/redfish.1.0.0.role.1.0.0.json

@@ -6,6 +6,7 @@
   "OemPrivileges": [],
   "@odata.id": "<%= url %>",
   "Oem": {},
+  "Id": "",
   "AssignedPrivileges": [
     <% rolePrivileges.forEach(function(rolePrivilege, i, arr) { %>
   "<%= rolePrivilege %>"

data/views/redfish-1.0/redfish.1.0.0.thermal.1.0.0.json

@@ -30,7 +30,7 @@
 			{
 				"Oem": {},
 				"FanName": "<%= sdr['sensorId'] %>",
-				"ReadingRPM": <%= _.isNaN(parseFloat(sdr['sensorReading'])) ? 'null' : parseFloat(sdr['sensorReading']) %>,
+				"Reading": <%= _.isNaN(parseFloat(sdr['sensorReading'])) ? 'null' : parseFloat(sdr['sensorReading']) %>,
 				"UpperThresholdNonCritical": <%= _.isNaN(parseFloat(sdr['upperNonCritical'])) ? 'null' : parseFloat(sdr['upperNonCritical']) %>,
 				"UpperThresholdCritical": <%= _.isNaN(parseFloat(sdr['upperCritical'])) ? 'null' : parseFloat(sdr['upperCritical']) %>,
 				"UpperThresholdFatal": null,

debianstatic/on-http/changelog

@@ -1,6 +1,7 @@
-on-http (1.0.0) UNRELEASED; urgency=low
+on-http (1.1.0) UNRELEASED; urgency=low
 
   * Initial release
   * release 1.0.0
+  * release 1.1.0
 
- -- rackhd <rackhd@emc.com>  Fri, 13 Jan 2017 21:02:27 -0500
+ -- rackhd <rackhd@emc.com>  Fri, 27 Jan 2017 21:02:08 -0500

install-task-doc.sh

@@ -1,5 +1,7 @@
 # Copyright 2016, EMC, Inc.
 
+set -e
+
 if [ ! -d './node_modules/on-tasks/' ]; then
     echo 'on-tasks folder not found, please run npm install.'
     exit 1
@@ -21,3 +23,5 @@ cp -rf ./node_modules/apidoc/template/* ./static/taskdoc/
 # Copy generated json file to ./static folder, override existing files
 mv -f ./node_modules/on-tasks/api_data.js ./static/taskdoc
 mv -f ./node_modules/on-tasks/task_doc_data.json ./static/taskdoc/api_data.json
+
+echo "Visit http://<server>:<port>/taskdoc for task documentation web page"

lib/api/1.1/northbound/router.js

@@ -20,6 +20,10 @@ function northApiFactory (injector) {
 
         // Un-mount existing routes when mounting.
         this.unMountAllRouters();
+        router.all("*", function (req, res, next) {
+        res.setHeader('X-Warning', 'Deprecated API');
+        return next();
+        });
 
         router.use(injector.get(require('./catalogs')));
         router.use(injector.get(require('./config')));
@@ -46,4 +50,4 @@ function northApiFactory (injector) {
     };
 
     return router;
-}
+}

lib/api/1.1/southbound/router.js

@@ -21,6 +21,10 @@ function internalApiFactory (injector) {
         // Un-mount existing routes when mounting.
         this.unMountAllRouters();
 
+        router.all("*", function (req, res, next) {
+        res.setHeader('X-Warning', 'Deprecated API');
+        return next();
+        });
         router.use(injector.get(require('./profiles')));
         router.use(injector.get(require('./files')));
         router.use(injector.get(require('./tasks')));

lib/api/2.0/hooks.js

@@ -0,0 +1,66 @@
+// Copyright 2017, Dell EMC, Inc.
+
+'use strict';
+
+var injector = require('../../../index.js').injector;
+var controller = injector.get('Http.Services.Swagger').controller;
+var hooks = injector.get('Http.Services.Api.Hooks');
+
+/**
+ * @api {get} /api/2.0/hooks GET /
+ * @apiDescription get list of hooks
+ * @apiName hooks-get
+ * @apiGroup hooks
+ */
+var hooksGetAll = controller(function(req) {
+    return hooks.getHooks(req.query);
+});
+
+/**
+ * @api {get} /api/2.0/hooks/:identifier GET /:identifier
+ * @apiDescription get list of hooks
+ * @apiName hooks-get
+ * @apiGroup hooks
+ */
+var hooksGetById = controller(function(req) {
+    return hooks.getHookById(req.swagger.params.identifier.value);
+});
+
+/**
+ * @api {POST} /api/2.0/hooks POST /
+ * @apiDescription post a new hook
+ * @apiName hooks-post
+ * @apiGroup hooks
+ */
+var hooksPost = controller({success: 201}, function(req) {
+    return hooks.createHook(req.body);
+});
+
+/**
+ * @api {PATCH} /api/2.0/hooks/:identifier POST /:identifier
+ * @apiDescription patch an existing hook
+ * @apiName hooks-patch
+ * @apiGroup hooks
+ */
+var hooksPatchById = controller(function(req) {
+    return hooks.updateHookById(req.swagger.params.identifier.value, req.body);
+});
+
+/**
+ * @api {DELETE} /api/2.0/hooks/:identifier DELETE /:identifier
+ * @apiDescription delete an existing hook
+ * @apiName hooks-delete
+ * @apiGroup hooks
+ */
+var hooksDelById = controller({success: 204}, function(req) {
+    return hooks.deleteHookById(req.swagger.params.identifier.value);
+});
+
+module.exports = {
+    hooksGetAll: hooksGetAll,
+    hooksPost: hooksPost,
+    hooksPatchById: hooksPatchById,
+    hooksDelById: hooksDelById,
+    hooksGetById: hooksGetById
+};
+

lib/api/redfish-1.0/account-service.js

@@ -15,7 +15,7 @@ var configuration = injector.get('Services.Configuration');
 var getAccountService = controller(function(req, res) {
     var options = redfish.makeOptions(req, res);
     return redfish.render('redfish.1.0.0.accountservice.1.0.0.json', 
-                 'AccountService.1.0.0.json#/definitions/AccountService',
+                 'AccountService.v1_1_0.json#/definitions/AccountService',
                   options)
     .catch(function(error) {
         return redfish.handleError(error, res);
@@ -46,8 +46,8 @@ var getAccount = controller(function(req, res) {
             throw new Errors.NotFoundError();
         }
         options.user = user;
-        return redfish.render('redfish.1.0.0.manageraccount.1.0.0.json', 
-                 'ManagerAccount.1.0.0.json#/definitions/ManagerAccount',
+        return redfish.render('redfish.1.0.0.manageraccount.1.0.0.json',
+                 'ManagerAccount.v1_0_3.json#/definitions/ManagerAccount',
                   options);
     })
     .catch(function(error) {
@@ -104,8 +104,8 @@ var createAccount = controller({success: 201}, function(req, res) {
             throw new Errors.NotFoundError();
         }
         options.user = user;
-        return redfish.render('redfish.1.0.0.manageraccount.1.0.0.json', 
-                 'ManagerAccount.1.0.0.json#/definitions/ManagerAccount',
+        return redfish.render('redfish.1.0.0.manageraccount.1.0.0.json',
+                 'ManagerAccount.v1_0_3.json#/definitions/ManagerAccount',
                   options)
         .then(function(data) {
             res.location('/redfish/v1/AccountService/Accounts/' + user.username);
@@ -155,8 +155,8 @@ var modifyAccount = controller({success: 202}, function(req, res) {
     })
     .then(function(user) {
         options.user = user;
-        return redfish.render('redfish.1.0.0.manageraccount.1.0.0.json', 
-                 'ManagerAccount.1.0.0.json#/definitions/ManagerAccount',
+        return redfish.render('redfish.1.0.0.manageraccount.1.0.0.json',
+                 'ManagerAccount.v1_0_3.json#/definitions/ManagerAccount',
                   options);
     })
     .catch(function(error) {

lib/api/redfish-1.0/chassis.js

@@ -200,7 +200,7 @@ var getChassis = controller(function(req, res) {
         })
 
         return redfish.render('redfish.1.0.0.chassis.1.0.0.json', 
-                        'Chassis.1.0.0.json#/definitions/Chassis',
+                        'Chassis.v1_4_0.json#/definitions/Chassis',
                         _.merge({}, obj, options));
     })
     .catch(function(error) {
@@ -241,7 +241,7 @@ var getThermal = controller(function(req, res) {
         });
 
         return redfish.render('redfish.1.0.0.thermal.1.0.0.json', 
-                        'Thermal.1.0.0.json#/definitions/Thermal',
+                        'Thermal.v1_2_0.json#/definitions/Thermal',
                         options);
     }).catch(function(error) {
         return redfish.handleError(error, res);
@@ -281,7 +281,7 @@ var getPower = controller(function(req, res) {
         });
 
         return redfish.render('redfish.1.0.0.power.1.0.0.json', 
-                        'Power.1.0.0.json#/definitions/Power',
+                        'Power.v1_2_1.json#/definitions/Power',
                         options);
     }).catch(function(error) {
         return redfish.handleError(error, res);

lib/api/redfish-1.0/event-service.js

@@ -74,7 +74,7 @@ var eventCallback = function(events) {
                         (event.reading.sensorReadingUnits ? event.reading.sensorReadingUnits : '');
                     record.MessageId = "Alert.1.0." +
                         event.reading.sensorId.replace(/[^A-Za-z0-9.]/g,'');
-                    return redfish.validateSchema(record, 'Event.1.0.0.json#/definitions/EventRecord') //jshint ignore: line
+                    return redfish.validateSchema(record, 'Event.v1_1_2.json#/definitions/EventRecord') //jshint ignore: line
                     .then(function(result) {
                         if(result.error) {
                             throw new Error(result.error);
@@ -102,7 +102,7 @@ var eventCallback = function(events) {
                         event.reading.statesAsserted.toString();
                     record.MessageId = "StatusChange.1.0." +
                         event.reading.sensorId.replace(/[^A-Za-z0-9.]/g,'');
-                    return redfish.validateSchema(record, 'Event.1.0.0.json#/definitions/EventRecord') //jshint ignore: line
+                    return redfish.validateSchema(record, 'Event.v1_1_2.json#/definitions/EventRecord') //jshint ignore: line
                     .then(function(result) {
                         if(result.error) {
                             throw new Error(result.error);
@@ -132,7 +132,7 @@ var eventCallback = function(events) {
                     record.EventTimestamp = new Date().toISOString();
                     record.Message = JSON.stringify(event.data);
                     record.MessageId = event.EventType + ".1.0.EndPoints";
-                    return redfish.validateSchema(record, 'Event.1.0.0.json#/definitions/EventRecord') //jshint ignore: line
+                    return redfish.validateSchema(record, 'Event.v1_1_2.json#/definitions/EventRecord') //jshint ignore: line
                     .then(function(result) {
                         if(result.error) {
                             throw new Error(result.error);
@@ -155,7 +155,7 @@ var eventServiceRoot = controller(function(req, res) {
         options.timeoutInSeconds = timeoutInSeconds;
         options.retryAttempts = retryAttempts;
         return redfish.render('redfish.1.0.0.eventservice.1.0.0.json',
-                'EventService.1.0.0.json#/definitions/EventService',
+                'EventService.v1_0_3.json#/definitions/EventService',
                 options);
     })
     .catch(function(error) {
@@ -181,7 +181,7 @@ var createSubscription = controller(function(req, res) {
     var options = redfish.makeOptions(req, res);
     var event = req.swagger.params.payload.value;
     return redfish.validateSchema(event,
-        'EventDestination.1.0.0.json#/definitions/EventDestination'
+        'EventDestination.v1_1_1.json#/definitions/EventDestination'
     )
     .then(function validatePayload(result) {
         if(result.error) {
@@ -227,7 +227,7 @@ var testEvent = controller({success: 202},function(req, res) {
             record.EventTimestamp = new Date().toISOString();
             record.Message = 'Generated TestEvent to ' + subscription.Destination;
             record.MessageId = 'TestEvent.1.0.0';
-            return redfish.validateSchema(record, 'Event.1.0.0.json#/definitions/EventRecord')
+            return redfish.validateSchema(record, 'Event.v1_1_2.json#/definitions/EventRecord')
             .then(function(result) {
                 if(result.error) {
                     throw new Error(result.error);
@@ -257,7 +257,7 @@ var getEvent = controller(function(req, res) {
         }
         options.subscription = event;
         return redfish.render('redfish.1.0.0.eventdestination.json',
-                'EventDestination.1.0.0.json#/definitions/EventDestination',
+                'EventDestination.v1_1_1.json#/definitions/EventDestination',
                 options);
     })
     .catch(function(error) {