UI and controller to interact with Rackscale simulator APIs. #711

mmnelemane · 2016-10-10T09:12:48Z

Provides a basic UI interface for RackScale systems:

Lists all the available Systems with their System IDs as a table of check-boxes
The UI allows the user to select one or more systems in the list for allocation
Clicking on the Allocate button creates a basic node object based on the data obtained through Redfish APIs from the RackScale simulator
The Nodes/Dashboard screen displays the list of allocated nodes and some basic info on the node.

NOTE: The UI need not be final and only done for easier test and a basic demo.

Here are a few sample screen-shot.

This PR depends on #693

Itxaka

Looking good!

Itxaka · 2016-10-10T09:36:42Z

crowbar_framework/app/controllers/intelrsd_controller.rb

+
+  def show
+    @title = "Welcome to RackScale Design"
+    @redfish_client = RedfishHelper::RedfishClient.new('10.160.66.119', '8443')


Maybe we can initialise the client as part of the class so we dont have to create a client per method?

Also, missing getting the host+port from env variables.

Itxaka · 2016-10-10T09:37:05Z

crowbar_framework/app/controllers/intelrsd_controller.rb

+    @title = "Welcome to RackScale Design"
+    @redfish_client = RedfishHelper::RedfishClient.new('10.160.66.119', '8443')
+    sys_list = get_all_systems()
+    p "SYSTEM LIST: #{sys_list}"


Rails.logger instead of p?

houndci-bot · 2016-12-19T14:36:50Z

crowbar_framework/lib/crowbar/settings.rb

+        # consider some better cache/expiration strategy.
+        if @@domain.nil?
+          dns_proposal = Proposal.where(barclamp: "dns", name: "default").first
+          @@domain = dns_proposal[:attributes][:dns][:domain] unless dns_proposal.nil?


Style/ClassVars: Replace class var @@Domain with a class instance var. (https://github.com/bbatsov/ruby-style-guide#no-class-vars)

houndci-bot · 2016-12-19T14:36:50Z

crowbar_framework/lib/crowbar/settings.rb

+        # consider some better cache/expiration strategy.
+        if @@domain.nil?
+          dns_proposal = Proposal.where(barclamp: "dns", name: "default").first
+          @@domain = dns_proposal[:attributes][:dns][:domain] unless dns_proposal.nil?


Style/ClassVars: Replace class var @@Domain with a class instance var. (https://github.com/bbatsov/ruby-style-guide#no-class-vars)

houndci-bot · 2016-12-19T14:36:50Z

crowbar_framework/lib/crowbar/settings.rb

+
+module Crowbar
+  class Settings
+    @@domain = nil


Style/ClassVars: Replace class var @@Domain with a class instance var. (https://github.com/bbatsov/ruby-style-guide#no-class-vars)

houndci-bot · 2016-12-19T14:36:50Z

crowbar_framework/lib/crowbar/settings.rb

+
+module Crowbar
+  class Settings
+    @@domain = nil


Style/ClassVars: Replace class var @@Domain with a class instance var. (https://github.com/bbatsov/ruby-style-guide#no-class-vars)

houndci-bot · 2016-12-19T14:36:50Z

crowbar_framework/lib/crowbar/upgrade.rb

+        end
+        JSON.load(network_proposal[3])
+      else
+        JSON.load(json_path.read)


Security/JSONLoad: Prefer JSON.parse over JSON.load. (http://ruby-doc.org/stdlib-2.3.0/libdoc/json/rdoc/JSON.html#method-i-load)

houndci-bot · 2016-12-19T14:36:50Z

crowbar_framework/lib/crowbar/upgrade.rb

+        end
+        JSON.load(network_proposal[3])
+      else
+        JSON.load(json_path.read)


Security/JSONLoad: Prefer JSON.parse over JSON.load. (http://ruby-doc.org/stdlib-2.3.0/libdoc/json/rdoc/JSON.html#method-i-load)

houndci-bot · 2016-12-19T14:36:50Z

crowbar_framework/lib/crowbar/upgrade.rb

+        network_proposal = proposals["proposals"]["records"].detect do |p|
+          p[1] == "network" && p[2] == "default"
+        end
+        JSON.load(network_proposal[3])


Security/JSONLoad: Prefer JSON.parse over JSON.load. (http://ruby-doc.org/stdlib-2.3.0/libdoc/json/rdoc/JSON.html#method-i-load)

houndci-bot · 2016-12-19T14:36:51Z

crowbar_framework/lib/crowbar/upgrade.rb

+        network_proposal = proposals["proposals"]["records"].detect do |p|
+          p[1] == "network" && p[2] == "default"
+        end
+        JSON.load(network_proposal[3])


Security/JSONLoad: Prefer JSON.parse over JSON.load. (http://ruby-doc.org/stdlib-2.3.0/libdoc/json/rdoc/JSON.html#method-i-load)

houndci-bot · 2016-12-19T14:36:51Z

crowbar_framework/lib/crowbar/platform.rb

+        return "Windows Server 2012" if target_platform == "windows-6.2"
+        return "Hyper-V Server 2012 R2" if target_platform == "hyperv-6.3"
+        return "Hyper-V Server 2012" if target_platform == "hyperv-6.2"
+        return target_platform


Style/RedundantReturn: Redundant return detected. (https://github.com/bbatsov/ruby-style-guide#no-explicit-return)

houndci-bot · 2016-12-19T14:36:51Z

crowbar_framework/lib/crowbar/platform.rb

+        return "Windows Server 2012" if target_platform == "windows-6.2"
+        return "Hyper-V Server 2012 R2" if target_platform == "hyperv-6.3"
+        return "Hyper-V Server 2012" if target_platform == "hyperv-6.2"
+        return target_platform


Style/RedundantReturn: Redundant return detected. (https://github.com/bbatsov/ruby-style-guide#no-explicit-return)

houndci-bot · 2016-12-19T14:36:51Z

crowbar_framework/spec/controllers/api/upgrade_controller_spec.rb

+      )
+    end
+
+    it "checks for node repositories" do


Metrics/BlockLength: Block has too many lines. [32/25]

houndci-bot · 2016-12-19T14:36:51Z

crowbar_framework/spec/controllers/api/upgrade_controller_spec.rb

+      )
+    end
+
+    it "checks for node repositories" do


Metrics/BlockLength: Block has too many lines. [32/25]

houndci-bot · 2016-12-19T14:36:51Z

crowbar_framework/spec/controllers/api/upgrade_controller_spec.rb

+require "spec_helper"
+
+describe Api::UpgradeController, type: :request do
+  context "with a successful upgrade API request" do


Metrics/BlockLength: Block has too many lines. [158/25]

houndci-bot · 2016-12-19T14:36:51Z

crowbar_framework/spec/controllers/api/upgrade_controller_spec.rb

+require "spec_helper"
+
+describe Api::UpgradeController, type: :request do
+  context "with a successful upgrade API request" do


Metrics/BlockLength: Block has too many lines. [158/25]

houndci-bot · 2016-12-19T14:36:51Z

crowbar_framework/spec/controllers/api/upgrade_controller_spec.rb

@@ -0,0 +1,186 @@
+require "spec_helper"
+
+describe Api::UpgradeController, type: :request do


Metrics/BlockLength: Block has too many lines. [160/25]

houndci-bot · 2016-12-19T14:36:52Z

crowbar_framework/spec/controllers/api/upgrade_controller_spec.rb

@@ -0,0 +1,186 @@
+require "spec_helper"
+
+describe Api::UpgradeController, type: :request do


Metrics/BlockLength: Block has too many lines. [160/25]

houndci-bot · 2016-12-19T14:36:52Z

crowbar_framework/spec/controllers/api/errors_controller_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+describe Api::ErrorsController, type: :request do


Metrics/BlockLength: Block has too many lines. [26/25]

houndci-bot · 2016-12-19T14:36:52Z

crowbar_framework/spec/controllers/api/errors_controller_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+describe Api::ErrorsController, type: :request do


Metrics/BlockLength: Block has too many lines. [26/25]

houndci-bot · 2016-12-19T14:36:52Z

crowbar_framework/spec/controllers/api/crowbar_controller_spec.rb

+require "spec_helper"
+
+describe Api::CrowbarController, type: :request do
+  context "with a successful crowbar API request" do


Metrics/BlockLength: Block has too many lines. [66/25]

houndci-bot · 2016-12-19T14:36:52Z

crowbar_framework/spec/controllers/api/crowbar_controller_spec.rb

+require "spec_helper"
+
+describe Api::CrowbarController, type: :request do
+  context "with a successful crowbar API request" do


Metrics/BlockLength: Block has too many lines. [66/25]

houndci-bot · 2016-12-19T14:36:52Z

crowbar_framework/spec/controllers/api/crowbar_controller_spec.rb

@@ -0,0 +1,79 @@
+require "spec_helper"
+
+describe Api::CrowbarController, type: :request do


Metrics/BlockLength: Block has too many lines. [68/25]

houndci-bot · 2016-12-19T16:29:36Z

crowbar_framework/lib/crowbar/settings.rb

-        options[:show] << :bios unless options[:bios].empty?
-
+        options = { raid: {}, bios: {}, show: [] }
+        unless proposals[0]["attributes"].nil? or proposals[0]["attributes"]["crowbar"].nil?


Style/AndOr: Use || instead of or. (https://github.com/bbatsov/ruby-style-guide#no-and-or-or)

houndci-bot · 2016-12-19T16:29:36Z

crowbar_framework/lib/crowbar/settings.rb

-        options = { raid: {}, bios: {}, show: [] }
-
+        proposals = Proposal.where(barclamp: "crowbar")
+        raise "Can't find any crowbar proposal" if proposals.nil? or proposals[0].nil?


Style/AndOr: Use || instead of or. (https://github.com/bbatsov/ruby-style-guide#no-and-or-or)

houndci-bot · 2016-12-19T16:29:37Z

crowbar_framework/lib/crowbar/settings.rb

        if @@domain.nil?
          dns_proposal = Proposal.where(barclamp: "dns", name: "default").first
          @@domain = dns_proposal[:attributes][:dns][:domain] unless dns_proposal.nil?
        end

        if @@domain.nil?
-          return `dnsdomainname`.strip
+          return %x{dnsdomainname}.strip


Style/CommandLiteral: Use backticks around command string. (https://github.com/bbatsov/ruby-style-guide#percent-x)

houndci-bot · 2016-12-19T16:29:37Z

crowbar_framework/lib/crowbar/settings.rb

    @@domain = nil

    class << self
      def domain
-        # FIXME: We are using a global here to avoid lookups. We need to
-        # consider some better cache/expiration strategy.
+        # NOTE: We are using a global here to avoid lookups.  We need to consider some better cache/expiration strategy


Metrics/LineLength: Line is too long. [119/100] (https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricslinelength)

houndci-bot · 2016-12-19T16:29:37Z

crowbar_framework/lib/crowbar/settings.rb

@@ -16,51 +16,39 @@

 module Crowbar
  class Settings
+


Style/EmptyLinesAroundClassBody: Extra empty line detected at class body beginning.

houndci-bot · 2016-12-19T16:29:37Z

crowbar_framework/config/routes.rb

-  end
+  # Install route from each barclamp
+  Rails.root.join("config", "routes.d").children.each do |routes|
+    eval(routes.read, binding) if routes.extname == ".routes"


Lint/Eval: The use of eval is a serious security risk.

houndci-bot · 2016-12-19T16:29:37Z

crowbar_framework/config/routes.rb

-    end
-  end
+  # Install route from each barclamp
+  Rails.root.join("config", "routes.d").children.each do |routes|


Style/MultilineIfModifier: Favor a normal if-statement over a modifier clause in a multiline statement. (https://github.com/bbatsov/ruby-style-guide#no-multiline-if-modifiers)

houndci-bot · 2016-12-19T16:29:38Z

crowbar_framework/lib/crowbar/checks/network.rb

              else
-                next unless ip_addr.ipv4?
+                addresses.push address if ip_addr.ipv4?


Style/IfInsideElse: Convert if nested inside else to elsif.

houndci-bot · 2016-12-19T16:29:38Z

crowbar_framework/lib/crowbar/checks/network.rb

-          # end
+          #unless ipv6_configured || ipv6_addrs.empty?
+          #  return false
+          #end


Style/LeadingCommentSpace: Missing space after #. (https://github.com/bbatsov/ruby-style-guide#hash-space)

houndci-bot · 2016-12-19T16:29:38Z

crowbar_framework/lib/crowbar/checks/network.rb

-          # unless ipv6_configured || ipv6_addrs.empty?
-          #   return false
-          # end
+          #unless ipv6_configured || ipv6_addrs.empty?


Style/LeadingCommentSpace: Missing space after #. (https://github.com/bbatsov/ruby-style-guide#hash-space)

houndci-bot · 2016-12-19T16:29:38Z

crowbar_framework/app/models/node_object.rb

@@ -1579,7 +1633,7 @@ def process_raid_boot
      return true
    end

-    false
+    return false


Style/RedundantReturn: Redundant return detected. (https://github.com/bbatsov/ruby-style-guide#no-explicit-return)

houndci-bot · 2016-12-19T16:29:39Z

crowbar_framework/app/models/node_object.rb

@@ -1562,7 +1616,7 @@ def process_raid_member(device, attributes)
      end
    end

-    false
+    return false


Style/RedundantReturn: Redundant return detected. (https://github.com/bbatsov/ruby-style-guide#no-explicit-return)

houndci-bot · 2016-12-19T16:29:39Z

crowbar_framework/app/models/node_object.rb

@@ -1544,7 +1598,7 @@ def process_raid_device(device, attributes)
      end
    end

-    false
+    return false


Style/RedundantReturn: Redundant return detected. (https://github.com/bbatsov/ruby-style-guide#no-explicit-return)

houndci-bot · 2016-12-19T16:29:39Z

crowbar_framework/app/models/node_object.rb

      Rails.logger.warn "Alias #{value}.#{domain} FQDN not saved because it exceeded the 63 character length limit or it's length (#{value.length}) will cause the total DNS max of 255 to be exeeded."
-      raise "#{I18n.t("too_long_dns_alias", scope: "model.node")}: #{value}.#{domain}"
+      raise "#{I18n.t('too_long_dns_alias', scope: 'model.node')}: #{value}.#{domain}"


Style/StringLiteralsInInterpolation: Prefer double-quoted strings inside interpolations. (https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylestringliteralsininterpolation)

houndci-bot · 2016-12-19T16:31:00Z

crowbar_framework/app/models/crowbar_service.rb

    end

    # commit current proposal (with the crowbar-upgrade role still assigned to nodes),
    # so the recipe is executed when nodes have 'ready' state
-    proposal_commit("default", false, false)
+    self.proposal_commit("default", false, false)


Style/RedundantSelf: Redundant self detected. (https://github.com/bbatsov/ruby-style-guide#no-self-unless-required)

houndci-bot · 2016-12-19T16:31:00Z

crowbar_framework/app/models/crowbar_service.rb

-      node["crowbar_wall"]["crowbar_upgrade_step"] = "revert_to_ready"
-      node.save
-      node.set_state("ready")
+      if node.state == "crowbar_upgrade"


Style/Next: Use next to skip iteration. (https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals)

houndci-bot · 2016-12-19T16:31:01Z

crowbar_framework/app/models/api/node.rb

-      if ssh_status[0] != 200
-        save_error_state("Failed to reboot the machine. Could not ssh.")
+      # Join the cluster: start pacemaker and run selected recipes
+      script = "/usr/sbin/crowbar-post-upgrade.sh"


Lint/UnreachableCode: Unreachable code detected.

- Lists available systems from Rackscale Simulator - Allows selection of specific systems for allocation - Creates a node object and allocates the same as a crowbar node - Also refined the controller to obtain system-specific info - UI contains only a list of check-boxes and one Allocate button

…ocalhost and default port On node creation: - set the proper node+domain for the node object - set the node name to the short name - set the fqdn and domain name to the proper ones - set the uptime to avoid failure on node details UI - set the roles to just names so they are linked to the barclamps - set the product name, serial number so they are shown properly in the UI - set the disk key for removable so disks are shown properly on the UI - count all the memory and aggregate it to be shown on the UI - count the processors with an 0 index so they can be shown in the UI - allocate the node - set the node to ready status All the node creation changes also fix the node not being shown properly when going to the details as well as crowbar crashing when moving the node to a different group

- Store 2 more items in the NodeObject to identify and track the rackscale instances - Rewrite the rest-client queries to protect and log http exceptions - Create several Power management shortcuts for the RedFish client - Create a handler for redfish commands - On power management actions, check for rackscale and execute the actions via rest calls

houndci-bot · 2016-12-19T16:38:42Z

crowbar_framework/app/controllers/intelrsd_controller.rb

+    @port = @rsd_server_port
+    Rails.logger.warn "RackScale Server: #{@host}, Port: #{@port}"
+    #@redfish_client = RedfishHelper::RedfishClient.new(host, port)
+  end  


Style/TrailingWhitespace: Trailing whitespace detected. (https://github.com/bbatsov/ruby-style-guide#no-trailing-whitespace)

houndci-bot · 2016-12-19T16:38:42Z

crowbar_framework/app/controllers/intelrsd_controller.rb

+    @host = @rsd_rest_server
+    @port = @rsd_server_port
+    Rails.logger.warn "RackScale Server: #{@host}, Port: #{@port}"
+    #@redfish_client = RedfishHelper::RedfishClient.new(host, port)


Style/LeadingCommentSpace: Missing space after #. (https://github.com/bbatsov/ruby-style-guide#hash-space)

- Added text boxes to edit PSME server IP and port.

mmnelemane added wip do not merge yet labels Oct 10, 2016

Itxaka reviewed Oct 10, 2016

View reviewed changes

mmnelemane force-pushed the rsd_integration branch from afb3a36 to 94ae042 Compare October 11, 2016 13:58

mmnelemane force-pushed the rsd_integration branch 4 times, most recently from f19f2ec to 8e9db87 Compare October 19, 2016 09:39

mmnelemane force-pushed the rsd_integration branch from 8e9db87 to fb944d1 Compare December 19, 2016 14:35

houndci-bot reviewed Dec 19, 2016

View reviewed changes

mmnelemane force-pushed the rsd_integration branch from 9a37d09 to 99e4866 Compare December 19, 2016 16:30

houndci-bot reviewed Dec 19, 2016

View reviewed changes

mmnelemane and others added 4 commits December 19, 2016 17:33

Initial Draft to support intelRSD and RedFish APIs

f5630c0

mmnelemane force-pushed the rsd_integration branch from 99e4866 to c27d8f9 Compare December 19, 2016 16:38

houndci-bot reviewed Dec 19, 2016

View reviewed changes

Improvements to Crowbar-UI for Rackscale

7310846

- Added text boxes to edit PSME server IP and port.

mmnelemane force-pushed the rsd_integration branch from c27d8f9 to 7310846 Compare December 19, 2016 17:20

mmnelemane changed the title ~~[NotForMerge]UI to Allocate nodes from Rackscale systems~~ UI and controller to interact with Rackscale simulator APIs. Dec 19, 2016

jsuchome added the needs backport to SOC7 (stable/4.0) label Jun 15, 2017

dirkmueller removed the needs backport to SOC7 (stable/4.0) label Oct 5, 2017

		@@ -0,0 +1,186 @@
		require "spec_helper"

		describe Api::UpgradeController, type: :request do

		@@ -0,0 +1,36 @@
		require "spec_helper"

		describe Api::ErrorsController, type: :request do

		@@ -0,0 +1,79 @@
		require "spec_helper"

		describe Api::CrowbarController, type: :request do

UI and controller to interact with Rackscale simulator APIs. #711

Are you sure you want to change the base?

UI and controller to interact with Rackscale simulator APIs. #711

Conversation

mmnelemane commented Oct 10, 2016 • edited

Itxaka left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mmnelemane commented Oct 10, 2016 •

edited