Add datacenter getter/setter, change 'dell_switch' to just 'switch', trap call to change_password.

salt/loader.py

@@ -541,7 +541,7 @@ def grain_funcs(opts):
                       )
 
 
-def grains(opts, force_refresh=False):
+def grains(opts, force_refresh=False, proxy=None):
     '''
     Return the functions for the dynamic grains and the values for the static
     grains.

salt/modules/dracr.py

@@ -42,10 +42,10 @@ def __parse_drac(output):
                 drac[section].update(dict(
                     [[prop.strip() for prop in i.split('=')]]
                 ))
-        else:
-            section = i.strip()[:-1]
-            if section not in drac and section:
-                drac[section] = {}
+            else:
+                section = i.strip()[1:-1]
+                if section not in drac and section:
+                    drac[section] = {}
 
     return drac
 
@@ -125,11 +125,35 @@ def __execute_ret(command, host=None,
             if len(l.strip()) == 0:
                 continue
             fmtlines.append(l)
+            if '=' in l:
+                continue
+            break
         cmd['stdout'] = '\n'.join(fmtlines)
 
     return cmd
 
 
+def get_dns_dracname(host=None,
+                     admin_username=None, admin_password=None):
+    import pydevd
+    pydevd.settrace('172.16.207.1', port=65500, stdoutToServer=True, stderrToServer=True)
+
+    ret = __execute_ret('get iDRAC.NIC.DNSRacName', host=host,
+                        admin_username=admin_username,
+                        admin_password=admin_password)
+    parsed = __parse_drac(ret['stdout'])
+    return parsed
+
+def set_dns_dracname(name,
+                     host=None,
+                     admin_username=None, admin_password=None):
+
+    ret = __execute_ret('set iDRAC.NIC.DNSRacName {0}'.format(name),
+                        host=host,
+                        admin_username=admin_username,
+                        admin_password=admin_password)
+    return ret
+
 def system_info(host=None,
                 admin_username=None, admin_password=None,
                 module=None):
@@ -645,6 +669,40 @@ def set_network(ip, netmask, gateway, host=None,
     ))
 
 
+def server_power(status, host=None,
+                  admin_username=None,
+                  admin_password=None,
+                  module=None):
+    '''
+    status
+        One of 'powerup', 'powerdown', 'powercycle', 'hardreset',
+        'graceshutdown'
+
+    host
+        The chassis host.
+
+    admin_username
+        The username used to access the chassis.
+
+    admin_password
+        The password used to access the chassis.
+
+    module
+        The element to reboot on the chassis such as a blade. If not provided,
+        the chassis will be rebooted.
+
+    CLI Example:
+
+    .. code-block:: bash
+
+        salt dell dracr.server_reboot
+        salt dell dracr.server_reboot module=server-1
+
+    '''
+    return __execute_cmd('serveraction {0}'.format(status),
+                         host=host, admin_username=admin_username,
+                         admin_password=admin_password, module=module)
+
 def server_reboot(host=None,
                   admin_username=None,
                   admin_password=None,
@@ -946,10 +1004,9 @@ def set_slotname(slot, name, host=None,
             admin_username=root admin_password=secret
 
     '''
-    return __execute_cmd('setslotname -i {0} {1}'.format(
-        slot, name[0:14], host=host,
-        admin_username=admin_username,
-        admin_password=admin_password))
+    return __execute_cmd('config -g cfgServerInfo -o cfgServerName -i {0} {1}'.format(slot, name),
+                         host=host, admin_username=admin_username,
+                         admin_password=admin_password)
 
 
 def set_chassis_name(name,

salt/states/dellchassis.py

@@ -10,14 +10,14 @@ Below is an example state that sets parameters just to show the basics.
 
     my-dell-chassis:
       dellchassis.chassis:
-        - name: my-dell-chassis
+        - chassis_name: my-dell-chassis
         - datacenter: dc-1-us
         - location: my-location
         - mode: 2
         - idrac_launch: 1
         - slot_names:
-          - 1: my-slot-name
-          - 2: my-other-slot-name
+          - server-1: my-slot-name
+          - server-2: my-other-slot-name
         - blade_power_states:
           - server-1: on
           - server-2: off
@@ -44,8 +44,8 @@ structure:
         management_mode: 2
         idrac_launch: 0
         slot_names:
-          1: blade1
-          2: blade2
+          - 'server-1': blade1
+          - 'server-2': blade2
 
         blades:
            blade1:
@@ -142,13 +142,12 @@ def __virtual__():
     return 'chassis.cmd' in __salt__
 
 
-def blade_idrac(name, idrac_password=None, idrac_ipmi=None,
+def blade_idrac(idrac_password=None, idrac_ipmi=None,
                 idrac_ip=None, idrac_netmask=None, idrac_gateway=None,
                 drac_dhcp=None):
     '''
     Set parameters for iDRAC in a blade.
 
-    :param name: The name of the blade to address
     :param idrac_password: Password to establish for the iDRAC interface
     :param idrac_ipmi: Enable/Disable IPMI over LAN
     :param idrac_ip: Set IP address for iDRAC
@@ -159,16 +158,52 @@ def blade_idrac(name, idrac_password=None, idrac_ipmi=None,
     :return: A standard Salt changes dictionary
     '''
 
+    ret = {'chassis_name': chassis_name,
+           'result': True,
+           'changes': {},
+           'comment': ''}
+
+    if not idrac_password:
+        password = __pillar__['proxy']['admin_password']
+    else:
+        password = idrac_password
+
+
+    if idrac_ipmi:
+        if idrac_ipmi == True:
+            idrac_ipmi = '1'
+        if idrac_ipmi == False:
+            idrac_ipmi = '0'
+        current_ipmi = __salt__['dracr.get_general']('cfgIpmiLan', 'cfgIpmiLanEnable',
+                                                     host=idrac_ip, admin_username='root',
+                                                     admin_password=password)
+
+        if current_ipmi != idrac_ipmi:
+            ch = { 'Old': current_ipmi, 'New': idrac_ipmi }
+            changes['IPMI'] = ch
+
+    if idrac_dnsname:
+        dnsret = __salt__['dracr.get_dns_dracname'](host=idrac_ip, admin_username='root',
+                                                    admin_password=password)
+        current_dnsname = dnsret['Key=iDRAC.Embedded.1#NIC.1']['DNSRacName']
+        if current_dnsname != idrac_dnsname:
+            ch = { 'Old': current_dnsname,
+                   'New': idrac_dnsname }
+            changes['DNSRacName'] = ch
+
+    if
+    if 'IPMI' i
+
     pass
 
 
-def chassis(name, password=None, datacenter=None,
+def chassis(name, chassis_name=None, password=None, datacenter=None,
             location=None, mode=None, idrac_launch=None, slot_names=None,
             blade_power_states=None):
     '''
     Manage a Dell Chassis.
 
-    name
+    chassis_name
         The name of the chassis.
 
     datacenter
@@ -224,7 +259,7 @@ def chassis(name, password=None, datacenter=None,
               - server-2: off
               - server-3: powercycle
     '''
-    ret = {'name': name,
+    ret = {'chassis_name': chassis_name,
            'result': True,
            'changes': {},
            'comment': ''}
@@ -234,17 +269,19 @@ def chassis(name, password=None, datacenter=None,
     mode_cmd = 'cfgRacTuneChassisMgmtAtServer'
     launch_cmd = 'cfgRacTuneIdracDNSLaunchEnable'
 
+    inventory = __salt__[chassis_cmd]('inventory')
+
     if idrac_launch:
         idrac_launch = str(idrac_launch)
 
     current_name = __salt__[chassis_cmd]('get_chassis_name')
-    if name != current_name:
+    if chassis_name != current_name:
         ret['changes'].update({'Name':
                               {'Old': current_name,
-                               'New': name}})
+                               'New': chassis_name}})
 
     current_dc = __salt__[chassis_cmd]('get_chassis_datacenter')
-    if datacenter != current_dc:
+    if datacenter and datacenter != current_dc:
         ret['changes'].update({'Datacenter':
                                    {'Old': current_dc,
                                     'New': datacenter}})
@@ -275,11 +312,16 @@ def chassis(name, password=None, datacenter=None,
 
     if slot_names:
         current_slot_names = __salt__[chassis_cmd]('list_slotnames')
-        for key, val in slot_names:
+        for s in slot_names:
+            key = s.keys()[0]
+            new_name = s[key]
+            if key.startswith('slot-'):
+                key = key[5:]
+
             current_slot_name = current_slot_names.get(key).get('slotname')
-            if current_slot_name != val['name']:
+            if current_slot_name != new_name:
                 old = {key: current_slot_name}
-                new = {key: val}
+                new = {key: new_name}
                 if ret['changes'].get('Slot Names') is None:
                     ret['changes'].update({'Slot Names':
                                           {'Old': {},
@@ -287,17 +329,27 @@ def chassis(name, password=None, datacenter=None,
                 ret['changes']['Slot Names']['Old'].update(old)
                 ret['changes']['Slot Names']['New'].update(new)
 
-    # TODO: Refactor this and make DRY - can probable farm this out to a new function
+    current_power_states = {}
+    target_power_states = {}
     if blade_power_states:
-        # TODO: Get the power state list working
-        current_power_states = 'get a list of current power states'
-        for key, val in blade_power_states:
-            # TODO: Get the correct state infos
-            current_power_state = current_power_states.get(key).get('state')
-            # TODO: Don't just compare values, check if True should be "on" or "off" etc
-            if current_power_state != val:
-                old = {key: current_power_state}
-                new = {key: val}
+        for b in blade_power_states:
+            key = b.keys()[0]
+            status = __salt__[chassis_cmd]('server_powerstatus', module=key)
+            current_power_states[key] = status.get('status', -1)
+            if b[key] == 'powerdown':
+                if current_power_states[key] != -1 and current_power_states[key]:
+                    target_power_states[key] = 'powerdown'
+            if b[key] == 'powerup':
+                if current_power_states[key] != -1 and not current_power_states[key]:
+                    target_power_states[key] = 'powerup'
+            if b[key] == 'powercycle':
+                if current_power_states[key] != -1 and not current_power_states[key]:
+                    target_power_states[key] = 'powerup'
+                if current_power_states[key] != -1 and current_power_states[key]:
+                    target_power_states[key] = 'powercycle'
+        for k, v in target_power_states.iteritems():
+                old = {k: current_power_states[k]}
+                new = {k: v}
                 if ret['changes'].get('Blade Power States') is None:
                     ret['changes'].update({'Blade Power States':
                                           {'Old': {},
@@ -318,9 +370,24 @@ def chassis(name, password=None, datacenter=None,
     name = __salt__[chassis_cmd]('set_chassis_name', name)
     if location:
         location = __salt__[chassis_cmd]('set_chassis_location', location)
+    pw_result = True
+    import pydevd
+    pydevd.settrace('172.16.207.1', port=65500, stdoutToServer=True, stderrToServer=True)
     if password:
-        pw_result = __salt__[chassis_cmd]('change_password', username='root',
-                                          password=password)
+        pw_single = True
+        if __salt__[chassis_cmd]('change_password', username='root', uid=1,
+                                   password=password):
+            for blade in inventory['server'].keys():
+                pw_single = __salt__[chassis_cmd]('deploy_password',
+                                                  username='root',
+                                                  password=password,
+                                                  module=blade)
+                if not pw_single:
+                    pw_result = False
+        else:
+            pw_result = False
+
+
     if datacenter:
         datacenter_result = __salt__[chassis_cmd]('set_chassis_datacenter',
                                                   datacenter)
@@ -328,17 +395,28 @@ def chassis(name, password=None, datacenter=None,
         mode = __salt__[chassis_cmd]('set_general', cfg_tuning, mode_cmd, mode)
     if idrac_launch:
         idrac_launch = __salt__[chassis_cmd]('set_general', cfg_tuning, launch_cmd, idrac_launch)
-    if slot_names:
+    if ret['changes'].get('Slot Names') is not None:
         slot_rets = []
-        for key, val in slot_names.iteritems():
-            slot_name = val.get('slotname')
-            slot_rets.append(__salt__[chassis_cmd]('set_slotname', key, slot_name))
+        for s in slot_names:
+            key = s.keys()[0]
+            new_name = s[key]
+            if key.startswith('slot-'):
+                key = key[5:]
+            slot_rets.append(__salt__[chassis_cmd]('set_slotname', key, new_name))
+
         if any(slot_rets) is False:
             slot_names = False
         else:
             slot_names = True
 
-    if any([name, location, mode, idrac_launch, slot_names]) is False:
+    powerchange_all_ok = True
+    for k, v in target_power_states.iteritems():
+        powerchange_ok = __salt__[chassis_cmd]('server_power', v, module=k)
+        if not powerchange_ok:
+            powerchange_all_ok = False
+
+    if any([name, location, mode, idrac_launch,
+            slot_names, powerchange_all_ok]) is False:
         ret['result'] = False
         ret['comment'] = 'There was an error setting the Dell chassis.'