enfcli 4.1.0.pre.beta → 5.0.1

data/lib/enfapi/dns.rb

@@ -0,0 +1,95 @@
+#
+# Copyright 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.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module EnfApi
+  class Dns
+    include Singleton
+
+    def initialize
+      @version = "v1"
+      @xdns_base_url = "/api/xdns/#{@version}"
+    end
+
+    def list_zones(domain)
+      EnfApi::API.instance.get "#{@xdns_base_url}/zones?enf_domain=#{domain}"
+    end
+
+    def create_dns_zone(new_zone)
+      json = EnfApi::to_json(new_zone)
+      EnfApi::API.instance.post "#{@xdns_base_url}/zones", json
+    end
+
+    def update_dns_zone(zone_id, updated_zone)
+      json = EnfApi::to_json(updated_zone)
+      EnfApi::API.instance.put "#{@xdns_base_url}/zones/#{zone_id}", json
+    end
+
+    def delete_dns_zone(zone_id)
+      EnfApi::API.instance.delete "#{@xdns_base_url}/zones/#{zone_id}"
+    end
+
+    def add_networks_to_zone(zone_id, add_networks)
+      json = EnfApi::to_json(add_networks)
+      EnfApi::API.instance.post "#{@xdns_base_url}/zones/#{zone_id}/networks", json
+    end
+
+    def replace_networks_in_zone(zone_id, replace_networks)
+      json = EnfApi::to_json(replace_networks)
+      EnfApi::API.instance.put "#{@xdns_base_url}/zones/#{zone_id}/networks", json
+    end
+
+    def list_networks_in_zone(zone_id)
+      EnfApi::API.instance.get "#{@xdns_base_url}/zones/#{zone_id}/networks"
+    end
+
+    def delete_networks_from_zone(zone_id, delete_networks)
+      EnfApi::API.instance.delete "#{@xdns_base_url}/zones/#{zone_id}/networks?delete=#{delete_networks}"
+    end
+
+    def list_zones_in_network(network)
+      EnfApi::API.instance.get "#{@xdns_base_url}/networks/#{network}/zones"
+    end
+
+    def provision_server(network, new_server)
+      json = EnfApi::to_json(new_server)
+      EnfApi::API.instance.post "#{@xdns_base_url}/networks/#{network}/servers", json
+    end
+
+    def list_servers(network)
+      EnfApi::API.instance.get "#{@xdns_base_url}/networks/#{network}/servers"
+    end
+
+    def delete_server(network, server_ipv6)
+      EnfApi::API.instance.delete "#{@xdns_base_url}/networks/#{network}/servers/#{server_ipv6}"
+    end
+
+    def create_dns_record(zone_id, new_record)
+      json = EnfApi::to_json(new_record)
+      EnfApi::API.instance.post "#{@xdns_base_url}/zones/#{zone_id}/records", json
+    end
+
+    def list_dns_records(zone_id)
+      EnfApi::API.instance.get "#{@xdns_base_url}/zones/#{zone_id}/records"
+    end
+
+    def query(network, type, name)
+      EnfApi::API.instance.get "#{@xdns_base_url}/networks/#{network}/query/#{type}/#{name}"
+    end
+
+    def delete_dns_record(record_id)
+      EnfApi::API.instance.delete "#{@xdns_base_url}/records/#{record_id}"
+    end
+  end
+end

data/lib/enfapi/firewall.rb

@@ -0,0 +1,37 @@
+#
+# Copyright 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.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "singleton"
+
+module EnfApi
+  class Firewall
+    include Singleton
+
+    def list_firewall_rules(network)
+      EnfApi::API.instance.get "/api/xfw/v2/#{network}/rule"
+    end
+
+    def add_firewall_rule(network, rule)
+      rule_json = EnfApi::to_json(rule)
+      EnfApi::API.instance.post "/api/xfw/v2/#{network}/rule", rule_json
+    end
+
+    def delete_firewall_rules(network, id = nil)
+      # Same method to call to delete all firewall rules in a network. if id is nil
+      EnfApi::API.instance.delete "/api/xfw/v2/#{network}/rule/#{id}"
+    end
+  end
+end

data/lib/enfapi/user.rb

@@ -0,0 +1,75 @@
+#
+# Copyright 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.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module EnfApi
+  class UserManager
+    include Singleton
+
+    def initialize
+      @version = "v3"
+      @xcr_base_url = "/api/xcr/#{@version}"
+    end
+
+    def list_users(query)
+      EnfApi::API.instance.get "#{@xcr_base_url}/users#{query}"
+    end
+
+    def get_user(email)
+      EnfApi::API.instance.get "#{@xcr_base_url}/users/#{email}"
+    end
+
+    def list_user_roles(user, network)
+      url = "#{@xcr_base_url}/users/#{user}/roles"
+      url += "?network=#{network}" if network
+      EnfApi::API.instance.get url
+    end
+
+    def delete_user_roles(user_id, roles, network)
+      url = "#{@xcr_base_url}/users/#{user_id}/roles?roles=#{roles}"
+      url += "&network=#{network}" if network
+      EnfApi::API.instance.delete url
+    end
+
+    def add_user_role(user_id, role_hash)
+      json = EnfApi::to_json(role_hash)
+      url = "#{@xcr_base_url}/users/#{user_id}/roles"
+      EnfApi::API.instance.post url, json
+    end
+
+    def list_invites(domain)
+      url = "#{@xcr_base_url}/invites"
+      url += "?domain=#{domain}" if domain
+      EnfApi::API.instance.get url
+    end
+
+    def invite(hash)
+      json = EnfApi::to_json(hash)
+      EnfApi::API.instance.post "#{@xcr_base_url}/invites", json
+    end
+
+    def delete_invite(invite_id)
+      EnfApi::API.instance.delete "#{@xcr_base_url}/invites/#{invite_id}"
+    end
+
+    def resend_invite(invite_id)
+      EnfApi::API.instance.put "#{@xcr_base_url}/invites/#{invite_id}", "{}"
+    end
+
+    def update_user_status(user_id, status)
+      json = EnfApi::to_json(status)
+      EnfApi::API.instance.put "#{@xcr_base_url}/users/#{user_id}/status", json
+    end
+  end
+end

data/lib/enfcli.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2018 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.
@@ -112,7 +112,7 @@ module EnfCli
 
   def self.ask_password(prompt = nil)
     begin
-      prompt = "Enter Password:" unless prompt
+      prompt ||= "Enter Password:"
       print prompt
       # We hide the entered characters before to ask for the password
       system "stty -echo"
@@ -134,7 +134,7 @@ module EnfCli
 
     # Generate cert
     cert = OpenSSL::X509::Certificate.new
-    cert.subject = cert.issuer = OpenSSL::X509::Name.new([["CN", "#{ipv6}"]])
+    cert.subject = cert.issuer = OpenSSL::X509::Name.new([["CN", ipv6.to_s]])
     cert.not_before = Time.now
     cert.not_after = Time.now + 365 * 24 * 60 * 60
     cert.public_key = key
@@ -190,15 +190,41 @@ module EnfCli
     end
 
     def xaptum_admin?
-      self.user_role == "XAPTUM_ADMIN"
+      has_role? "XAPTUM_ADMIN"
     end
 
-    def user_role
-      @session[:type]
+    def domain_admin?
+      has_role? "DOMAIN_ADMIN"
+    end
+
+    def domain_user?
+      has_role? "DOMAIN_USER"
+    end
+
+    def network_admin?
+      has_role? "NETWORK_ADMIN"
+    end
+
+    def network_user?
+      has_role? "NETWORK_USER"
+    end
+
+    def edit_domain_role?
+      xaptum_admin? || domain_admin?
+    end
+
+    def has_role?(role)
+      all_roles = @session[:roles]
+      all_roles.each do |cur_role|
+        if cur_role[:role] == role
+          return true
+        end
+      end
+      false
     end
 
     def host
-      "#{@host}"
+      @host.to_s
     end
 
     def auth_token
@@ -229,8 +255,8 @@ module EnfCli
     }
 
     desc "connect", "Connect to ENF Controller"
-    method_option :host, :type => :string
-    method_option :user, :type => :string
+    method_option :host, type: :string
+    method_option :user, type: :string
 
     def connect(*names)
       host = ""
@@ -278,7 +304,7 @@ module EnfCli
       puts EnfCli::VERSION
     end
 
-    desc "update", "", :hide => true
+    desc "update", "", hide: true
 
     def update
       cmd = Gem::Commands::UpdateCommand.new
@@ -286,7 +312,7 @@ module EnfCli
       execute_gem_cmd cmd
     end
 
-    desc "search", "", :hide => true
+    desc "search", "", hide: true
 
     def search
       cmd = Gem::Commands::SearchCommand.new
@@ -295,14 +321,14 @@ module EnfCli
     end
 
     desc "create-config-file", "Create a Xaptum configuration file in your home directory"
-    method_option :host, :type => :string, :required => true
-    method_option :user, :type => :string, :required => true
+    method_option :host, type: :string, required: true
+    method_option :user, type: :string, required: true
 
     def create_config_file
       host = options[:host]
       user = options[:user]
       config_file = File.new(CONFIG_FILE, "w+")
-      config_file.puts({ :host => host, :user => user }.to_json)
+      config_file.puts({ host: host, user: user }.to_json)
       config_file.close
       say "Config file created successfully at #{CONFIG_FILE}!", :green
     end
@@ -349,7 +375,7 @@ module EnfCli
           trap("INT") { system("stty", stty_save); exit }
 
           while input = Readline.readline(EnfCli::CTX.instance.prompt, true)
-            break if input == "exit" or input == "\\q" or input == "quit"
+            break if input == "exit" or input == '\q' or input == "quit"
 
             # Remove blank lines from history
             Readline::HISTORY.pop if input == ""
@@ -362,12 +388,12 @@ module EnfCli
 
     # Shell CLI class
     class CLI < EnfCli::EnfThor
-      desc "ls [<dir>]", "List files in a directory", :hide => true
-      method_option :dir, :type => :string, :required => false
+      desc "ls [<dir>]", "List files in a directory", hide: true
+      method_option :dir, type: :string, required: false
 
       def ls(dir = nil)
         try_with_rescue do
-          dir = "." unless dir
+          dir ||= "."
           dir = EnfCli::expand_path(dir)
 
           Dir.entries(dir).each { |f|
@@ -376,7 +402,7 @@ module EnfCli
         end
       end
 
-      desc "cat <file>", "Display contents of a file", :hide => true
+      desc "cat <file>", "Display contents of a file", hide: true
 
       def cat(file)
         try_with_rescue do
@@ -390,7 +416,7 @@ module EnfCli
         end
       end
 
-      desc "pwd", "Current Working Directory", :hide => true
+      desc "pwd", "Current Working Directory", hide: true
 
       def pwd
         try_with_rescue do
@@ -398,17 +424,18 @@ module EnfCli
         end
       end
 
-      desc "cd [<dir>]", "Change working directory", :hide => true
+      desc "cd [<dir>]", "Change working directory", hide: true
 
       def cd(dir = "~")
         try_with_rescue do
           dir = EnfCli::expand_path(dir)
           raise EnfCli::ERROR, "No such directory #{dir}" unless Dir.exist?(dir)
+
           Dir.chdir(dir)
         end
       end
 
-      desc "host", "Display ENF Controller host", :hide => true
+      desc "host", "Display ENF Controller host", hide: true
 
       def host
         try_with_rescue do
@@ -416,7 +443,7 @@ module EnfCli
         end
       end
 
-      desc "clear", "Clear Terminal Screen", :hide => true
+      desc "clear", "Clear Terminal Screen", hide: true
 
       def clear
         try_with_rescue do
@@ -429,7 +456,7 @@ module EnfCli
 
       def display_session_token
         try_with_rescue_in_session do
-          say "#{EnfCli::CTX.instance.auth_token}"
+          say EnfCli::CTX.instance.auth_token.to_s
         end
       end
 

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.
@@ -278,6 +278,10 @@ module EnfCli
                                     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
@@ -293,6 +297,12 @@ 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
@@ -341,6 +351,10 @@ module EnfCli
                                     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
@@ -348,23 +362,250 @@ module EnfCli
           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
+
       #########################################################################
       #
       # Helper functions
@@ -383,20 +624,21 @@ 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
@@ -567,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?
@@ -584,7 +826,17 @@ 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
         end
@@ -613,7 +865,6 @@ module EnfCli
           # [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
 
@@ -623,11 +874,20 @@ module EnfCli
         def display_profile(profile, summary = false)
           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
@@ -654,13 +914,114 @@ module EnfCli
         # 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