enfcli 4.0.0 → 5.0.0.pre.alpha

data/lib/enfcli/commands/captive.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright 2018-2019 Xaptum,Inc
+# Copyright 2018-2020 Xaptum,Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,21 +15,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'enfthor'
-require 'enfapi'
-require 'json'
-require 'erb'
+require "enfthor"
+require "enfapi"
+require "json"
+require "erb"
 
 module EnfCli
   module Cmd
     class Captive < EnfThor
-      desc 'list-wifi-configurations',
-           'List wifi configuration information for all or the matching records.'
-      method_option :name, default: nil, type: :string, banner: 'NAME',
-                           desc: 'where NAME will match the user-given name.'
-      method_option :domain, default: nil, type: :string, banner: 'DOMAIN',
-                             aliases: '-d'
-      method_option :ssid, default: nil, type: :string, banner: 'SSID'
+      desc "list-wifi-configurations",
+           "List wifi configuration information for all or the matching records."
+      method_option :name, default: nil, type: :string, banner: "NAME",
+                           desc: "where NAME will match the user-given name."
+      method_option :domain, default: nil, type: :string, banner: "DOMAIN",
+                             aliases: "-d"
+      method_option :ssid, default: nil, type: :string, banner: "SSID"
+
       def list_wifi_configurations
         try_with_rescue_in_session do
           ## TODO: V1 is only listing all of the wifi configurations, it is not
@@ -40,15 +41,16 @@ module EnfCli
             # display the data
             display_wifi_configs wifi_configs
           else
-            say 'No WiFi configurations found.'
+            say "No WiFi configurations found."
           end
         end
       end
 
-      desc 'create-wifi-configuration', 'Create a new wifi configuration.'
+      desc "create-wifi-configuration", "Create a new wifi configuration."
       method_option :'wifi-config-file', type: :string, required: true,
-                                         banner: '<file>',
-                                         desc: '<file> is JSON file with parameters required for configuring the router card.'
+                                         banner: "<file>",
+                                         desc: "<file> is JSON file with parameters required for configuring the router card."
+
       def create_wifi_configuration
         try_with_rescue_in_session do
           json_file_name = options[:'wifi-config-file']
@@ -65,20 +67,21 @@ module EnfCli
         end
       end
 
-      desc 'get-wifi-configuration',
-           'Get details of the specified wifi configuration. Exactly one of: ' \
-           '--wifi-id, --profile-id, --device-id, or --wifi-name must be ' \
-           'specified.'
-      method_option :'wifi-id', defaut: nil, type: :string, banner: 'WIFI-ID',
-                                desc: 'WIFI-ID is the UUID of the wifi record'
-      method_option :version, defaut: nil, type: :string, banner: 'VERSION',
-                              desc: 'Optionally used with --wifi-id'
-      method_option :'profile-id', defaut: nil, type: :string, banner: 'PROFILE-ID',
-                                   desc: 'PROFILE-ID is the UUID of the profile.'
-      method_option :'device-id', defaut: nil, type: :string, banner: 'DEVICE-ID',
-                                  desc: 'DEVICE-ID is the UUID of the device.'
-      method_option :'wifi-name', defaut: nil, type: :string, banner: 'WIFI-NAME',
-                                  desc: 'Result matches any wifi configuration that contains the substring WIFI-NAME'
+      desc "get-wifi-configuration",
+           "Get details of the specified wifi configuration. Exactly one of: " \
+           "--wifi-id, --profile-id, --device-id, or --wifi-name must be " \
+           "specified."
+      method_option :'wifi-id', defaut: nil, type: :string, banner: "WIFI-ID",
+                                desc: "WIFI-ID is the UUID of the wifi record"
+      method_option :version, defaut: nil, type: :string, banner: "VERSION",
+                              desc: "Optionally used with --wifi-id"
+      method_option :'profile-id', defaut: nil, type: :string, banner: "PROFILE-ID",
+                                   desc: "PROFILE-ID is the UUID of the profile."
+      method_option :'device-id', defaut: nil, type: :string, banner: "DEVICE-ID",
+                                  desc: "DEVICE-ID is the UUID of the device."
+      method_option :'wifi-name', defaut: nil, type: :string, banner: "WIFI-NAME",
+                                  desc: "Result matches any wifi configuration that contains the substring WIFI-NAME"
+
       def get_wifi_configuration
         try_with_rescue_in_session do
           ## TODO - Currently, this only handles wifi-id, add the others to v2
@@ -95,31 +98,30 @@ module EnfCli
           num_query_opts += 1 if device_id
           num_query_opts += 1 if wifi_name
 
-          
-          raise 'ERROR: Exactly one of: --wifi-id, --profile-id, --device-id, or --wifi-name must be specified.' if num_query_opts != 1
+          raise "ERROR: Exactly one of: --wifi-id, --profile-id, --device-id, or --wifi-name must be specified." if num_query_opts != 1
 
           if wifi_id
             wifi_config = EnfApi::Captive.instance.get_wifi_configuration wifi_id, version
 
             # display the data
             display_wifi_detail wifi_config
-
           end
         end
       end
 
-      desc 'update-wifi-configuration',
-           'Update an existing wifi configuration.'
+      desc "update-wifi-configuration",
+           "Update an existing wifi configuration."
       method_option :'wifi-id', type: :string,
                                 required: true,
-                                banner: 'WIFI-ID',
-                                desc: 'WIFI-ID is the UUID of the wifi profile'
+                                banner: "WIFI-ID",
+                                desc: "WIFI-ID is the UUID of the wifi profile"
       method_option :'wifi-config-file', type: :string,
                                          required: true,
-                                         banner: '<file>',
-                                         desc: '<file> is JSON file with ' \
-                                            'parameters required for ' \
-                                            'configuring the router card.'
+                                         banner: "<file>",
+                                         desc: "<file> is JSON file with " \
+                                         "parameters required for " \
+                                         "configuring the router card."
+
       def update_wifi_configuration
         try_with_rescue_in_session do
           json_file_name = options[:'wifi-config-file']
@@ -133,29 +135,29 @@ module EnfCli
         end
       end
 
+      desc "create-device",
+           "Add a new device to the database. This is only available to Xaptum administrators"
+      method_option :'device-id', type: :string, required: true, banner: "SERIAL-NUM",
+                                  desc: "SERIAL-NUM is the serial number of the device."
+      method_option :'device-name', type: :string, default: nil, banner: "DEVICE-NAME",
+                                    desc: "User-defined name for the device."
+      method_option :'mac-addr1', type: :string, default: nil, banner: "MAC-ADDR1",
+                                  desc: "MAC address 1 (wifi address on a wifi-enabled device)"
+      method_option :'mac-addr2', type: :string, default: nil, banner: "MAC-ADDR2",
+                                  desc: "MAC address 2"
+      method_option :'mac-addr3', type: :string, default: nil, banner: "MAC-ADDR3",
+                                  desc: "MAC address 3"
+      method_option :'mac-addr4', type: :string, default: nil, banner: "MAC-ADDR4",
+                                  desc: "MAC address 4"
+      method_option :'profile-id', type: :string, default: nil, banner: "PROFILE_ID",
+                                   desc: "UUID of the profile that the device will use. The profile must already exist."
+      method_option :model, type: :string, default: nil, banner: "MODEL",
+                            desc: "Model identifier of the device"
 
-      desc 'create-device',
-           'Add a new device to the database. This is only available to Xaptum administrators'
-      method_option :'device-id', type: :string, required: true, banner: 'SERIAL-NUM',
-                                  desc: 'SERIAL-NUM is the serial number of the device.'
-      method_option :'device-name', type: :string, default: nil, banner: 'DEVICE-NAME',
-                                    desc: 'User-defined name for the device.'
-      method_option :'mac-addr1', type: :string, default: nil, banner: 'MAC-ADDR1',
-                                  desc: 'MAC address 1 (wifi address on a wifi-enabled device)'
-      method_option :'mac-addr2', type: :string, default: nil, banner: 'MAC-ADDR2',
-                                  desc: 'MAC address 2'
-      method_option :'mac-addr3', type: :string, default: nil, banner: 'MAC-ADDR3',
-                                  desc: 'MAC address 3'
-      method_option :'mac-addr4', type: :string, default: nil, banner: 'MAC-ADDR4',
-                                  desc: 'MAC address 4'
-      method_option :'profile-id', type: :string, default: nil, banner: 'PROFILE_ID',
-                                   desc: 'UUID of the profile that the device will use. The profile must already exist.'
-      method_option :model, type: :string, default: nil, banner: 'MODEL',
-                            desc: 'Model identifier of the device'
       def create_device
         try_with_rescue_in_session do
           new_device_hash = {
-            serial_number: options[:'device-id']
+            serial_number: options[:'device-id'],
           }
 
           mac1 = options[:'mac-addr1']
@@ -192,10 +194,11 @@ module EnfCli
         end
       end
 
-      desc 'list-devices',
-           'List basic device information for all devices matching the option specified.'
-      method_option :network, default: nil, type: :string, banner: 'NETWORK',
-                              desc: 'NETWORK is the ipv6 subnet used by the device.'
+      desc "list-devices",
+           "List basic device information for all devices matching the option specified."
+      method_option :network, default: nil, type: :string, banner: "NETWORK",
+                              desc: "NETWORK is the ipv6 subnet used by the device."
+
       def list_devices
         try_with_rescue_in_session do
           network = options[:network]
@@ -205,11 +208,12 @@ module EnfCli
         end
       end
 
-      desc 'get-device',
-           'Get details of the specified device.'
+      desc "get-device",
+           "Get details of the specified device."
       method_option :'device-id', required: true, type: :string,
-                                  banner: 'DEVICE-ID',
-                                  desc: 'DEVICE-ID is either the device serial number or its ipv6 address.'
+                                  banner: "DEVICE-ID",
+                                  desc: "DEVICE-ID is either the device serial number or its ipv6 address."
+
       def get_device
         try_with_rescue_in_session do
           device_id = ERB::Util::url_encode(options[:'device-id'])
@@ -220,14 +224,15 @@ module EnfCli
         end
       end
 
-      desc 'update-device',
-           'Update an existing device record with the values specified.'
-      method_option :'device-id', type: :string, required: true, banner: 'DEVICE-ID',
-                                  desc: 'DEVICE-ID is either the device serial number or its ipv6 address.'
-      method_option :'device-name', type: :string, default: nil, banner: 'DEVICE-NAME',
-                                  desc: 'User-defined name for the device.'
-      method_option :'profile-id', type: :string, default: nil, banner: 'PROFILE_ID',
-                                  desc: 'UUID of the profile that the device will use. The profile must already exist.'
+      desc "update-device",
+           "Update an existing device record with the values specified."
+      method_option :'device-id', type: :string, required: true, banner: "DEVICE-ID",
+                                  desc: "DEVICE-ID is either the device serial number or its ipv6 address."
+      method_option :'device-name', type: :string, default: nil, banner: "DEVICE-NAME",
+                                    desc: "User-defined name for the device."
+      method_option :'profile-id', type: :string, default: nil, banner: "PROFILE_ID",
+                                   desc: "UUID of the profile that the device will use. The profile must already exist."
+
       def update_device
         try_with_rescue_in_session do
           id = ERB::Util::url_encode(options[:'device-id'])
@@ -248,11 +253,12 @@ module EnfCli
         end
       end
 
-      desc 'get-device-status',
-            'Get the latest status of the specified device.'
+      desc "get-device-status",
+           "Get the latest status of the specified device."
       method_option :'device-id', required: true, type: :string,
-                                  banner: 'DEVICE-ID',
-                                  desc: 'DEVICE-ID is either the device serial number or its ipv6 address.'
+                                  banner: "DEVICE-ID",
+                                  desc: "DEVICE-ID is either the device serial number or its ipv6 address."
+
       def get_device_status
         try_with_rescue_in_session do
           device_id = ERB::Util::url_encode(options[:'device-id'])
@@ -262,22 +268,27 @@ module EnfCli
         end
       end
 
-      desc 'create-profile',
-           'Create a new profile.'
+      desc "create-profile",
+           "Create a new profile."
       method_option :'profile-name', type: :string, required: true,
-                                     banner: 'PROFILE-NAME',
-                                     desc: 'PROFILE-NAME is the user-given name.'
+                                     banner: "PROFILE-NAME",
+                                     desc: "PROFILE-NAME is the user-given name."
       method_option :'device-mode', type: :string, required: true,
-                                    banner: 'DEVICE-MODE',
-                                    desc: 'secure-host or passthrough'
-      method_option :'wifi-id', type: :string, default: nil, banner: 'WIFI-ID',
-                                desc: 'WIFI-ID is the UUID of the wifi record that the profile will use. wifi record must already exist'
+                                    banner: "DEVICE-MODE",
+                                    desc: "secure-host or passthrough"
+      method_option :'wifi-id', type: :string, default: nil, banner: "WIFI-ID",
+                                desc: "WIFI-ID is the UUID of the wifi record that the profile will use. wifi record must already exist"
+      method_option :'update-id', type: :string, default: nil,
+                                  banner: "UPDATE-ID",
+                                  desc: "UPDATE-ID is the UUID of the firmware update record. " \
+                                        "The firmware-update record must already exist."
+
       def create_profile
         try_with_rescue_in_session do
           profile_name = options[:'profile-name']
           new_profile_hash = {
             name: profile_name,
-            config: { mode: options[:'device-mode'] }
+            config: { mode: options[:'device-mode'] },
           }
 
           wifi = options[:'wifi-id']
@@ -286,16 +297,23 @@ module EnfCli
             new_profile_hash[:config][:wifi][:id] = wifi
           end
 
+          fw_update = options[:'update-id']
+          if fw_update
+            new_profile_hash[:config][:firmware] = {}
+            new_profile_hash[:config][:firmware][:id] = fw_update if fw_update
+          end
+
           # send the POST to create a new profile
           profile = EnfApi::Captive.instance.create_profile new_profile_hash
           display_profile profile
         end
       end
 
-      desc 'list-profiles',
-           'List the existing profiles.'
-      method_option :name, default: nil, type: :string, banner: 'NAME',
-                           desc: 'where NAME will match all or part of the user-given profile name.'
+      desc "list-profiles",
+           "List the existing profiles."
+      method_option :name, default: nil, type: :string, banner: "NAME",
+                           desc: "where NAME will match all or part of the user-given profile name."
+
       def list_profiles
         try_with_rescue_in_session do
           query_name = options[:name]
@@ -304,14 +322,14 @@ module EnfCli
         end
       end
 
-      desc 'get-profile',
-           'Get full detail listing of the profile.'
-      method_option :'profile-id', required: true, type: :string, 
-                                   banner: 'PROFILE-ID',
-                                   desc: 'PROFILE-ID is the UUID of the profile.'
-# TODO - server doesn't support version yet. 
-#      method_option :version, default: nil, type: :integer, banner: 'VERSION',
-#                              desc: 'Get a specific version.'
+      desc "get-profile",
+           "Get full detail listing of the profile."
+      method_option :'profile-id', required: true, type: :string,
+                                   banner: "PROFILE-ID",
+                                   desc: "PROFILE-ID is the UUID of the profile."
+      # TODO - server doesn't support version yet.
+      #      method_option :version, default: nil, type: :integer, banner: 'VERSION',
+      #                              desc: 'Get a specific version.'
       def get_profile
         try_with_rescue_in_session do
           profile = EnfApi::Captive.instance.get_profile options[:'profile-id']
@@ -319,44 +337,274 @@ module EnfCli
         end
       end
 
-      desc 'update-profile',
-           'Update a previously-created profile specified by PROFILE-ID.  At ' \
-           'least one property must be changed.'
-      method_option :'profile-id', required: true, type: :string, 
-                                   banner: 'PROFILE-ID',
-                                   desc: 'UUID of the device profile.'
+      desc "update-profile",
+           "Update a previously-created profile specified by PROFILE-ID.  At " \
+           "least one property must be changed."
+      method_option :'profile-id', required: true, type: :string,
+                                   banner: "PROFILE-ID",
+                                   desc: "UUID of the device profile."
       method_option :'profile-name', type: :string, default: nil,
-                                     banner: 'PROFILE-NAME',
-                                     desc: 'PROFILE-NAME is the user-given name.'
+                                     banner: "PROFILE-NAME",
+                                     desc: "PROFILE-NAME is the user-given name."
       method_option :'device-mode', type: :string, default: nil,
-                                    banner: 'DEVICE-MODE',
-                                    desc: 'secure-host or passthrough'
-      method_option :'wifi-id', type: :string, default: nil, banner: 'WIFI-ID',
-                                desc: 'WIFI-ID is the UUID of the wifi record that the profile will use. wifi record must already exist'
+                                    banner: "DEVICE-MODE",
+                                    desc: "secure-host or passthrough"
+      method_option :'wifi-id', type: :string, default: nil, banner: "WIFI-ID",
+                                desc: "WIFI-ID is the UUID of the wifi record that the profile will use. wifi record must already exist"
+      method_option :'update-id', type: :string, default: nil,
+                                  banner: "UPDATE-ID",
+                                  desc: "UPDATE-ID is the UUID of the firmware update record. " \
+                                        "The firmware-update record must already exist."
+
       def update_profile
         try_with_rescue_in_session do
           id = options[:'profile-id']
           name = options[:'profile-name']
           mode = options[:'device-mode']
           wifi_id = options[:'wifi-id']
+          fw_update = options[:'update-id']
 
-          raise "At least one option needs to change." if name == nil && mode == nil && wifi_id == nil
+          raise "At least one option needs to change." if name == nil && mode == nil && wifi_id == nil && fw_update == nil
 
           update_hash = {}
           update_hash[:name] = name if name
-          update_hash[:config] = {} if wifi_id || mode
+          update_hash[:config] = {} if wifi_id || mode || fw_update
           update_hash[:config][:mode] = mode if mode
           if wifi_id
             update_hash[:config][:wifi] = {}
             update_hash[:config][:wifi][:id] = wifi_id
           end
 
+          if fw_update
+            update_hash[:config][:firmware] = {}
+            update_hash[:config][:firmware][:id] = fw_update
+          end
           profile = EnfApi::Captive.instance.update_profile id, update_hash
           display_profile profile
+        end
+      end
+
+      desc "list-firmware-images",
+           "Lists all of the available versions of the firmware"
+
+      def list_firmware_images
+        try_with_rescue_in_session do
+          data = EnfApi::Captive.instance.list_firmware_images
+          display_firmware_image_list data
+        end
+      end
+
+      desc "upload-firmware-image",
+           "Uploads a new firmware image. Each version will have multiple " \
+           "images -- one for each type of hardware. \nNOTE: This version " \
+           "doesn't actually upload the file, it merely informs the server of " \
+           "its existance."
+      method_option :'image-file', required: true, type: :string,
+                                   banner: "<file>", desc: "<file> is the firmware binary image."
+      method_option :version, required: true, type: :string,
+                              banner: "VERSION",
+                              desc: "VERSION is the release version."
+      method_option :'image-name', type: :string, default: nil, banner: "NAME",
+                                   desc: "NAME is the name to associate with the firmware " \
+                                   "image. This is usually the generated filename. " \
+                                   "Defaults to the base name of <file>"
+
+      def upload_firmware_image
+        try_with_rescue_in_session do
+          filename = options[:'image-file']
+          version = options[:version]
+          image_name = options[:'image-name']
+
+          temp_img_name = File.basename(filename)
+          image_name ||= temp_img_name
+
+          raise "image-name does not match image-file" if temp_img_name != image_name
+
+          # This version PUTs an empty body
+          resp = EnfApi::Captive.instance.upload_firmware_image version, image_name
+
+          if (resp.code == 200)
+            say "Upload complete."
+          else
+            say "Upload failed with code #{resp.code}"
+          end
+        end
+      end
+
+      desc "get-firmware-info",
+           "Prints details of an existing firmware version."
+      method_option :version, required: true, type: :string,
+                              banner: "VERSION", desc: "VERSION is the release version."
+
+      def get_firmware_info
+        try_with_rescue_in_session do
+          version = options[:version]
 
+          fw_info = EnfApi::Captive.instance.get_firmware_info version
+
+          display_firmware_detail fw_info
+        end
+      end
+
+      desc "create-schedule",
+           "Creates a schedule object that will be used to determine when a " \
+           "device or group of devices may be upgraded. The schedule will be " \
+           "uploaded from a JSON-formatted file."
+      method_option :schedule, required: true, type: :string,
+                               banner: "<file>",
+                               desc: "<file> is a JSON file containing the desired schedule."
+
+      def create_schedule
+        try_with_rescue_in_session do
+          filename = options[:schedule]
+
+          # reading the whole file - shouldn't get more than a few KB
+          content = File.read filename
+          sched_hash = JSON.parse(content)
+
+          resp_data = EnfApi::Captive.instance.create_schedule sched_hash
+          display_schedule_detail resp_data
         end
       end
 
+      desc "list-schedules",
+           "Prints a summary list of all existing schedules."
+
+      def list_schedules
+        try_with_rescue_in_session do
+          sched_list = EnfApi::Captive.instance.list_schedules
+          display_schedule_list sched_list
+        end
+      end
+
+      desc "get-schedule",
+           "Prints the detail of a specific, existing schedule."
+      method_option :'schedule-id', type: :string, required: true, banner: "ID",
+                                    desc: "ID is the system-assigned UUID of the schedule " \
+                                          "to retrieve."
+
+      def get_schedule
+        try_with_rescue_in_session do
+          sched_id = options[:'schedule-id']
+          sched_data = EnfApi::Captive.instance.get_schedule sched_id
+          display_schedule_detail sched_data
+        end
+      end
+
+      desc "update-schedule",
+           "Modifies an existing schedule by uploading an updated schedule in " \
+           "the form of a JSON file."
+      method_option :'schedule-id', type: :string, required: true, banner: "ID",
+                                    desc: "ID is the UUID of the schedule to update."
+      method_option :schedule, type: :string, required: true, bannder: "<file>",
+                               desc: "<file> is a JSON file containing the desired schedule."
+
+      def update_schedule
+        try_with_rescue_in_session do
+          sched_id = options[:'schedule-id']
+          filename = options[:schedule]
+
+          # read in whole schedule file
+          content = File.read filename
+          sched_hash = JSON.parse(content)
+
+          resp_data = EnfApi::Captive.instance.update_schedule sched_id, sched_hash
+          display_schedule_detail resp_data
+        end
+      end
+
+      desc "delete-schedule",
+           "Deletes the specified, existing schedule."
+      method_option :'schedule-id', type: :string, required: true, banner: "ID",
+                                    desc: "ID is the system-assigned UUID of the schedule " \
+                                          "to delete."
+
+      def delete_schedule
+        try_with_rescue_in_session do
+          sched_id = options[:'schedule-id']
+
+          # get the name of the schedule
+          resp = EnfApi::Captive.instance.get_schedule(sched_id)
+          name = resp[:name]
+
+          resp = EnfApi::Captive.instance.delete_schedule sched_id
+
+          if (resp.code == 200)
+            say "Successfully deleted schedule named: #{name}"
+          elsif (resp.code == 409)
+            say "Schedule #{name} is being used by pending updates and cannot be deleted."
+          else
+            say "Failed to delete schedule #{name} with code #{resp.code}"
+          end
+        end
+      end
+
+      desc "list-firmware-updates",
+           "Lists the existing firmware update tasks."
+
+      def list_firmware_updates
+        try_with_rescue_in_session do
+          updates_list = EnfApi::Captive.instance.list_firmware_updates
+          display_updates_list updates_list
+        end
+      end
+
+      desc "get-firmware-update",
+           "Prints the details of the specified firmware update task."
+      method_option :'update-id', type: :string, required: true, banner: "ID",
+                                  desc: "ID is the UUID of the firmware update task"
+
+      def get_firmware_update
+        try_with_rescue_in_session do
+          update_id = options[:'update-id']
+
+          update_data = EnfApi::Captive.instance.get_firmware_update update_id
+          display_update_detail update_data
+        end
+      end
+
+      desc "create-firmware-update",
+           "Creates a firmware-update task that the system will use to update " \
+           "router-card firmware as prescribed in the specified JSON file."
+      method_option :update, type: :string, required: true, banner: "<file>",
+                             desc: "<file> is a JSON file containing the details of " \
+                                   "the update task."
+
+      def create_firmware_update
+        try_with_rescue_in_session do
+          filename = options[:update]
+
+          # reading the whole file - shouldn't get more than a few KB
+          content = File.read filename
+          update_hash = JSON.parse(content)
+
+          resp_data = EnfApi::Captive.instance.create_firmware_update update_hash
+          display_update_detail resp_data
+        end
+      end
+
+      desc "modify-firmware-update",
+           "Modifies an existing firmware-update task with the information " \
+           "contained in the specified JSON file"
+      method_option :'update-id', type: :string, required: true, banner: "ID",
+                                  desc: "ID is the UUID of the firmware update task to be modified."
+      method_option :update, type: :string, required: true, banner: "<file>",
+                             desc: "<file> is a JSON file containing the details of " \
+                                   "the update task."
+
+      def modify_firmware_update
+        try_with_rescue_in_session do
+          update_id = options[:'update-id']
+          filename = options[:update]
+
+          # reading the whole file - shouldn't get more than a few KB
+          content = File.read filename
+          update_hash = JSON.parse(content)
+
+          resp_data = EnfApi::Captive.instance.modify_firmware_update update_id, update_hash
+          display_update_detail resp_data
+        end
+      end
 
       #########################################################################
       #
@@ -367,7 +615,7 @@ module EnfCli
         # Displays the wifi configuration summary list.
         # TODO - Does non-Xaptum-admin columns only - add option to do admin list
         def display_wifi_configs(configs)
-          headings = ['ID', 'Wifi Name', 'Config Vers.']
+          headings = ["ID", "Wifi Name", "Config Vers."]
           rows = configs.map do |hash|
             [hash[:id], hash[:name], hash[:version]]
           end
@@ -376,25 +624,24 @@ module EnfCli
         end
 
         # Display a single wifi configuration in detail
-        def display_wifi_detail(wifi_data, full_listing=true)
+        def display_wifi_detail(wifi_data, full_listing = true, tabs = 0)
+          indent = "    " * tabs
           name = wifi_data[:name]
           wifi_id = wifi_data[:id]
           desc = wifi_data[:description]
           nets = wifi_data[:networks]
 
-          say "Wifi ID       : #{wifi_id}", nil, true
-          say "Name          : #{name}", nil, true
-          say "Description   : #{desc}", nil, true if desc
+          say indent + "Name          : #{name}", nil, true
+          say indent + "Wifi ID       : #{wifi_id}", nil, true
+          say indent + "Description   : #{desc}", nil, true if desc
           if full_listing
             say "WiFi Networks :"
             if nets
               nets.each do |wifi_net|
-                display_wifi_net(wifi_net, 1)
+                display_wifi_net(wifi_net, tabs + 1)
               end
             end
-  
           end
-
         end
 
         def display_wifi_net(wifi_net, tabs)
@@ -412,7 +659,7 @@ module EnfCli
           display_ipv6_addr(wifi_net[:IPv6], tabs + 1)
         end
 
-        def display_ipv4_addr (ipv4, tabs)
+        def display_ipv4_addr(ipv4, tabs)
           indent = "    " * tabs
           if ipv4.instance_of? String
             say indent + "IPv4         : #{ipv4}", nil, true
@@ -435,7 +682,7 @@ module EnfCli
           end
         end
 
-        def display_ipv6_addr (ipv6, tabs)
+        def display_ipv6_addr(ipv6, tabs)
           indent = "    " * tabs
           if ipv6.instance_of? String
             say indent + "IPv6         : #{ipv6}", nil, true
@@ -458,8 +705,6 @@ module EnfCli
           end
         end
 
-
-
         #
         # display the device info.
         # device_data is a hash matching the json structure
@@ -469,8 +714,8 @@ module EnfCli
           ctl_addr = device_data[:control_address]
           dev_addr = device_data[:device_address] || "\n"
           mac_addrs = device_data[:mac_address]
-          firmware = device_data[:firmware_version] || '< not available >'
-          model = device_data[:model] || '< not available >'
+          firmware = device_data[:firmware_version] || "< not available >"
+          model = device_data[:model] || "< not available >"
           profile = device_data[:profile]
           status = device_data[:status]
 
@@ -485,18 +730,18 @@ module EnfCli
             mac4 = mac_addrs[:'4']
 
             if !mac1
-              say 'Mac Address       : < not available >'
+              say "Mac Address       : < not available >"
             elsif !mac2 && !mac3 && !mac4
               say "Mac Address       : #{mac1}", nil, true
             else
-              say 'Mac Address       :'
+              say "Mac Address       :"
               say "              1   : #{mac1}", nil, true
               say "              2   : #{mac2}", nil, true if mac2
               say "              3   : #{mac3}", nil, true if mac3
               say "              4   : #{mac4}", nil, true if mac4
             end
           else
-            say 'Mac Address       : < not available >'
+            say "Mac Address       : < not available >"
           end
 
           say "Firmware Version  : #{firmware}", nil, true
@@ -508,19 +753,19 @@ module EnfCli
             say "Profile           : < not available >"
           end
           display_device_status_summary status
-          say ' ', nil, true
+          say " ", nil, true
         end
 
-        # 
+        #
         # display the status summary
         #
-        def display_device_status_summary (device_status)
+        def display_device_status_summary(device_status)
           if device_status
-            mode = device_status[:router_mode] || device_status[:mode] || '< not available >'
+            mode = device_status[:router_mode] || device_status[:mode] || "< not available >"
 
             wifi = device_status[:wifi]
 
-            say 'Status            :'
+            say "Status            :"
             say "    Router Mode   : #{mode}", nil, true
 
             if wifi
@@ -539,21 +784,21 @@ module EnfCli
         # status is a hash matching the json structure
         #
         def display_device_status(device_status)
-          sn = device_status[:serial_number] || '< not available >'
-          mode = device_status[:router_mode] || device_status[:mode] || '< not available >'
+          sn = device_status[:serial_number] || "< not available >"
+          mode = device_status[:router_mode] || device_status[:mode] || "< not available >"
 
-          uptime = device_status[:uptime] || '< not available >'
-          refresh = device_status[:refresh_time] || '< not available >'
+          uptime = device_status[:uptime] || "< not available >"
+          refresh = device_status[:refresh_time] || "< not available >"
 
           wifi = device_status[:wifi]
           if wifi
-            connected = wifi[:connected] || '< not available >'
+            connected = wifi[:connected] || "< not available >"
             ssid = wifi[:SSID]
             ipv4 = wifi[:IPv4_addresses]
             ipv6 = wifi[:IPv6_addresses]
             wifi_config = wifi[:config]
           else
-            connected = '< not available >'
+            connected = "< not available >"
             ssid = nil
             ipv4 = nil
             ipv6 = nil
@@ -564,7 +809,7 @@ module EnfCli
           say "Router Mode          : #{mode}", nil, true
           say "Uptime (in seconds)  : #{uptime}", nil, true
           say "Status refresh time  : #{refresh}", nil, true
-          say "WIFI                 :"
+          say "WIFI status          :"
           say "    connected        : #{connected}", nil, true
           say "    SSID             : #{ssid}" if ssid
           if ipv4 && !ipv4.empty?
@@ -581,17 +826,27 @@ module EnfCli
             end
           end
 
-          display_wifi_detail(wifi_config, false) if wifi_config
+          say "WIFI configuration   :"
+          display_wifi_detail(wifi_config, false, 1) if wifi_config
+
+          fw_status = device_status[:firmware]
+          if fw_status
+            image_name = fw_status[:image_name] || "< not available >"
+            image_state = fw_status[:state] || " < not available >"
+            say "Firmware Status      :"
+            say "    image name       : #{image_name}", nil, true
+            say "    operating state  : #{image_state}", nil, true
+          end
 
-          say ' ', nil, true
+          say " ", nil, true
         end
 
         #
         # display the devices summary list
         #
         def display_device_list(devices)
-          headings = ['Serial No', 'Dev Name', 'Dev Addr', 'Router Mode',
-                      'Connected', 'SSID']
+          headings = ["Serial No", "Dev Name", "Dev Addr", "Router Mode",
+                      "Connected", "SSID"]
           rows = devices.map do |hash|
             status = hash[:status]
             if status
@@ -601,16 +856,15 @@ module EnfCli
               mode = status[:router_mode] || status[:mode]
 
               [hash[:serial_number], hash[:device_name], hash[:device_address],
-                mode, connected, ssid]
+               mode, connected, ssid]
             else
               [hash[:serial_number], hash[:device_name], hash[:device_address],
-              nil, nil, nil]
+               nil, nil, nil]
             end
           end
           # [hash[:serial_number], hash[:device_name], hash[:device_address],
           # hash[:status][:router_mode], hash[:status][:wifi][:connected],
           # hash[:status][:wifi][:SSID]]
-
           render_table(headings, rows)
         end
 
@@ -618,13 +872,22 @@ module EnfCli
         # Display profile detail
         #
         def display_profile(profile, summary = false)
-          indent = summary ? '    ' : ''
+          indent = summary ? "    " : ""
+
+          firmware = profile[:config][:firmware]
+          fw_id = "< not configured >"
+          if firmware
+            fw_id = firmware[:id]
+            fw_version = firmware[:version]
+          end
 
           say indent + "Name                  : #{profile[:name]}", nil, true
           say indent + "Profile ID            : #{profile[:id]}", nil, true
           say indent + "Configuration version : #{profile[:config][:version]}", nil, true
+          say indent + "Firmware Update ID    : #{fw_id}", nil, true
           unless summary
-            say "Mode                  : #{profile[:config][:mode]}", nil, true
+            say indent + "    Update version    : #{fw_version}", nil, true if fw_version
+            say indent + "Mode                  : #{profile[:config][:mode]}", nil, true
             display_wifi_summary profile[:config][:wifi]
           end
         end
@@ -632,7 +895,7 @@ module EnfCli
         #
         # Display summary of the WIFI configuration info
         #
-        def display_wifi_summary (wifi)
+        def display_wifi_summary(wifi)
           if wifi
             say "Wifi config           :"
             say "    id                : #{wifi[:id]}", nil, true
@@ -645,22 +908,120 @@ module EnfCli
           else
             say "Wifi config           : < not configured >"
           end
-
         end
 
         #
         # display the profile summary list
         #
         def display_profile_list(profiles)
-          headings = ['Profile Name', 'Profile ID', 'Version']
+          headings = ["Profile Name", "Profile ID", "Version", "Mode", "Wifi ID", "Firmware Update ID"]
           rows = profiles.map do |hash|
-            [hash[:name], hash[:id], hash[:config][:version]]
+            config = hash[:config]
+            fw_id = config[:firmware] ? config[:firmware][:id] : "none"
+            [hash[:name], hash[:id], config[:version], config[:mode],
+             config[:wifi][:id], fw_id]
           end
+          render_table(headings, rows)
+        end
 
+        #
+        # Displays the list of firmware releases
+        #
+        def display_firmware_image_list(images)
+          headings = ["Firmware Version"]
+          rows = images.map do |element|
+            [element[:version]]
+          end
+          render_table(headings, rows)
+        end
+
+        #
+        # Displays firmware detail
+        #
+        def display_firmware_detail(fw_info)
+          version = fw_info[:version] || "< not available >"
+          images = fw_info[:images]
+
+          say "Release version: #{version}"
+          display_image_list images
+        end
+
+        #
+        # Displays the list of images available for a release version.
+        #
+        def display_image_list(images)
+          headings = ["Image Name", "Hardware Model", "Update Type", "SHA256"]
+          rows = images.map do |hash|
+            [hash[:name], hash[:model], hash[:type], hash[:sha256]]
+          end
+          render_table(headings, rows)
+        end
+
+        #
+        # Displays the full SCHEDULE object detail
+        #
+        def display_schedule_detail(sched_data)
+          name = sched_data[:name]
+          id = sched_data[:id]
+          domain = sched_data[:domain]
+          times = sched_data[:times]
+
+          say "Schedule Name    : #{name}", nil, true
+          say "Shedule ID       : #{id}", nil, true
+          say "domain           : #{domain}", nil, true
+          say "Times:", nil, true
+          display_time_list(times)
+        end
+
+        #
+        # Displays the list of times in a schedule as a table
+        #
+        def display_time_list(times)
+          headings = ["Name", "year", "Month", "Date", "Weekday", "Hour",
+                      "Minute", "id"]
+          rows = times.map do |hash|
+            [hash[:name], hash[:year], hash[:month], hash[:day_of_month],
+             hash[:day_of_week], hash[:hour], hash[:minute], hash[:id]]
+          end
+          render_table(headings, rows)
+        end
+
+        #
+        # Displays a list of schedules
+        #
+        def display_schedule_list(sched_list)
+          headings = ["Name", "ID"]
+          rows = sched_list.map do |hash|
+            [hash[:name], hash[:id]]
+          end
           render_table(headings, rows)
         end
 
+        #
+        # Displays a list of firmware updates
+        #
+        def display_updates_list(updates_list)
+          headings = ["Update ID", "Update Version"]
+          rows = updates_list.map do |hash|
+            [hash[:id], hash[:version]]
+          end
+          render_table(headings, rows)
+        end
 
+        #
+        # Displays detail of a specific firmware update task
+        #
+        def display_update_detail(update_data)
+          id = update_data[:id]
+          sched_id = update_data[:schedule_id]
+          version = update_data[:version]
+          percent = update_data[:update_percentage]
+
+          say "Update Task ID               : #{id}"
+          say "Schedule ID                  : #{sched_id}"
+          say "Firmware Version             : #{version}"
+          say "Percent of devices to update : #{percent}"
+        end
       end
     end
   end