Merge pull request #28502 from cachedout/lint_28427

Lint #28427

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:
+            else:
-            section = i.strip()[:-1]
+                section = i.strip()[1:-1]
-            if section not in drac and section:
+                if section not in drac and section:
-                drac[section] = {}
+                    drac[section] = {}
 
     return drac
 
@@ -125,11 +125,37 @@ 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 +671,41 @@ 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 +1007,9 @@ def set_slotname(slot, name, host=None,
             admin_username=root admin_password=secret
 
     '''
-    return __execute_cmd('setslotname -i {0} {1}'.format(
+    return __execute_cmd('config -g cfgServerInfo -o cfgServerName -i {0} {1}'.format(slot, name),
-        slot, name[0:14], host=host,
+                         host=host, admin_username=admin_username,
-        admin_username=admin_username,
+                         admin_password=admin_password)
-        admin_password=admin_password))
 
 
 def set_chassis_name(name,
@@ -1147,8 +1207,67 @@ def get_chassis_location(host=None,
 
     '''
     return system_info(host=host,
-                        admin_username=admin_username,
+                       admin_username=admin_username,
-                        admin_password=admin_password)['Chassis Information']['Chassis Location']
+                       admin_password=admin_password)['Chassis Information']['Chassis Location']
+
+
+def set_chassis_datacenter(location,
+                         host=None,
+                         admin_username=None,
+                         admin_password=None):
+    '''
+    Set the location of the chassis.
+
+    location
+        The name of the datacenter to be set on the chassis.
+
+    host
+        The chassis host.
+
+    admin_username
+        The username used to access the chassis.
+
+    admin_password
+        The password used to access the chassis.
+
+    CLI Example:
+
+    .. code-block:: bash
+
+        salt '*' dracr.set_chassis_datacenter datacenter-name host=111.222.333.444
+            admin_username=root admin_password=secret
+
+    '''
+    return set_general('cfgLocation', 'cfgLocationDatacenter', location,
+                         host=host, admin_username=admin_username,
+                         admin_password=admin_password)
+
+
+def get_chassis_datacenter(host=None,
+                         admin_username=None,
+                         admin_password=None):
+    '''
+    Get the datacenter of the chassis.
+
+    host
+        The chassis host.
+
+    admin_username
+        The username used to access the chassis.
+
+    admin_password
+        The password used to access the chassis.
+
+    CLI Example:
+
+    .. code-block:: bash
+
+        salt '*' dracr.set_chassis_location host=111.222.333.444
+           admin_username=root admin_password=secret
+
+    '''
+    return get_general('cfgLocation', 'cfgLocationDatacenter', host=host,
+                       admin_username=admin_username, admin_password=admin_password)
 
 
 def set_general(cfg_sec, cfg_var, val, host=None,

salt/proxy/fx2.py

@@ -217,6 +217,13 @@ def chconfig(cmd, *args, **kwargs):
     for k in kwargs.keys():
         if k.startswith('__pub_'):
             kwargs.pop(k)
+
+    # Catch password reset
+    if cmd == 'change_password':
+        if 'username' in kwargs:
+            DETAILS['admin_username'] = kwargs['username']
+        if 'password' in kwargs:
+            DETAILS['admin_password'] = kwargs['password']
     if 'dracr.'+cmd not in __salt__:
         return {'retcode': -1, 'message': 'dracr.' + cmd + ' is not available'}
     else:

salt/states/dellchassis.py

@@ -4,24 +4,131 @@ Manage chassis via Salt Proxies.
 
 .. versionadded:: 2015.8.2
 
-Example managing a Dell chassis:
+Below is an example state that sets parameters just to show the basics.
 
 .. code-block:: yaml
 
     my-dell-chassis:
-      chassis.dell:
+      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
+          - server-1: my-slot-name
-          - 2: my-other-slot-name
+          - server-2: my-other-slot-name
         - blade_power_states:
           - server-1: on
           - server-2: off
           - server-3: powercycle
 
+However, it is possible to place the entire set of chassis configuration
+data in pillar. Here's an example pillar
+structure:
+
+.. code-block:: yaml
+
+    proxy:
+      host: 10.27.20.18
+      admin_username: root
+      admin_password: saltstack
+      proxytype: fx2
+
+      chassis:
+        name: fx2-1
+        username: root
+        password: saltstack1
+        datacenter: london
+        location: rack-1-shelf-3
+        management_mode: 2
+        idrac_launch: 0
+        slot_names:
+          - 'server-1': blade1
+          - 'server-2': blade2
+
+        blades:
+           blade1:
+             idrac_password: saltstack1
+             ipmi_over_lan: True
+             ip: 172.17.17.1
+             subnet: 255.255.0.0
+             netmask: 172.17.255.255
+          blade2:
+             idrac_password: saltstack1
+             ipmi_over_lan: True
+             ip: 172.17.17.2
+             subnet: 255.255.0.0
+             netmask: 172.17.255.255
+          blade3:
+             idrac_password: saltstack1
+             ipmi_over_lan: True
+             ip: 172.17.17.2
+             subnet: 255.255.0.0
+             netmask: 172.17.255.255
+          blade4:
+             idrac_password: saltstack1
+             ipmi_over_lan: True
+             ip: 172.17.17.2
+             subnet: 255.255.0.0
+             netmask: 172.17.255.255
+
+        switches:
+          switch-1:
+            ip: 192.168.1.2
+            netmask: 255.255.255.0
+            broadcast: 192.168.1.255
+            snmp: nonpublic
+            password: saltstack1
+          switch-2:
+            ip: 192.168.1.3
+            netmask: 255.255.255.0
+            broadcast: 192.168.1.255
+            snmp: nonpublic
+            password: saltstack1
+
+And to go with it, here's an example state that pulls the data from pillar
+
+.. code-block:: yaml
+
+    {% set details = pillar['chassis'] with context %}
+    standup-step1:
+      dellchassis.chassis:
+        - name: {{ details['name'] }}
+        - location: {{ details['location'] }}
+        - mode: {{ details['management_mode'] }}
+        - idrac_launch: {{ details['idrac_launch'] }}
+        - slot_names
+          {% for k, v in details['chassis']['slot_names'].iteritems() %}
+          - {{ k }}: {{ v }}
+          {% endfor %}
+
+
+    {% for k, v in details['chassis']['switches'].iteritems() %}
+    standup-switches-{{ k }}:
+      dellchassis.dell_switch:
+        - name: {{ k }}
+        - ip: {{ v['ip'] }}
+        - netmask: {{ v['netmask'] }}
+        - gateway: {{ v['gateway'] }}
+        - password: {{ v['password'] }}
+        - snmp: {{ v['snmp'] }}
+    {% endfor %}
+
+    dellchassis
+    {% for k, v in details['chassis']['slot_names'].iteritems() %}
+
+          - {{ k }}: {{ v }}
+          {% endfor %}
+
+    blade_powercycle:
+      chassis.dell_chassis:
+        - blade_power_states:
+          - server-1: powercycle
+          - server-2: powercycle
+          - server-3: powercycle
+          - server-4: powercycle
+
 '''
 
 # Import python libs
@@ -35,13 +142,13 @@ 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,
+                idrac_dnsname=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
@@ -52,20 +159,58 @@ def blade_idrac(name, idrac_password=None, idrac_ipmi=None,
     :return: A standard Salt changes dictionary
     '''
 
-    pass
+    ret = {'result': True,
+           'changes': {},
+           'comment': ''}
+
+    if not idrac_password:
+        password = __pillar__['proxy']['admin_password']
+    else:
+        password = idrac_password
+
+    if idrac_ipmi:
+        if idrac_ipmi is True:
+            idrac_ipmi = '1'
+        if idrac_ipmi is 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}
+            ret['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}
+            ret['changes']['DNSRacName'] = ch
+
+    return ret
 
 
-def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
+def chassis(name, chassis_name=None, password=None, datacenter=None,
-         blade_power_states=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
+        The datacenter in which the chassis is located
+
     location
         The location of the chassis.
 
+    password
+        Password for the chassis
+
     mode
         The management mode of the chassis. Viable options are:
 
@@ -96,9 +241,10 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
     .. code-block:: yaml
 
         my-dell-chassis:
-          chassis.dell:
+          dellchassis.chassis:
             - name: my-dell-chassis
             - location: my-location
+            - datacenter: london
             - mode: 2
             - idrac_launch: 1
             - slot_names:
@@ -109,7 +255,7 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
               - server-2: off
               - server-3: powercycle
     '''
-    ret = {'name': name,
+    ret = {'chassis_name': chassis_name,
            'result': True,
            'changes': {},
            'comment': ''}
@@ -119,12 +265,27 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=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 and datacenter != current_dc:
+        ret['changes'].update({'Datacenter':
+                                   {'Old': current_dc,
+                                    'New': datacenter}})
+
+    if password:
+        ret['changes'].update({'Password':
+                                   {'Old': '******',
+                                     'New': '******'}})
     if location:
         current_location = __salt__[chassis_cmd]('get_chassis_location')
         if location != current_location:
@@ -147,11 +308,16 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=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': {},
@@ -159,23 +325,33 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=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 funciton
+    current_power_states = {}
+    target_power_states = {}
     if blade_power_states:
-        # TODO: Get the power state list working
+        for b in blade_power_states:
-        current_power_states = 'get a list of current power states'
+            key = b.keys()[0]
-        for key, val in blade_power_states:
+            status = __salt__[chassis_cmd]('server_powerstatus', module=key)
-            # TODO: Get the correct state infos
+            current_power_states[key] = status.get('status', -1)
-            current_power_state = current_power_states.get(key).get('state')
+            if b[key] == 'powerdown':
-            # TODO: Don't just compare values, check if True should be "on" or "off" etc
+                if current_power_states[key] != -1 and current_power_states[key]:
-            if current_power_state != val:
+                    target_power_states[key] = 'powerdown'
-                old = {key: current_power_state}
+            if b[key] == 'powerup':
-                new = {key: val}
+                if current_power_states[key] != -1 and not current_power_states[key]:
-                if ret['changes'].get('Blade Power States') is None:
+                    target_power_states[key] = 'powerup'
-                    ret['changes'].update({'Blade Power States':
+            if b[key] == 'powercycle':
-                                          {'Old': {},
+                if current_power_states[key] != -1 and not current_power_states[key]:
-                                           'New': {}}})
+                    target_power_states[key] = 'powerup'
-                ret['changes']['Blade Power States']['Old'].update(old)
+                if current_power_states[key] != -1 and current_power_states[key]:
-                ret['changes']['Blade Power States']['New'].update(new)
+                    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': {},
+                                       'New': {}}})
+            ret['changes']['Blade Power States']['Old'].update(old)
+            ret['changes']['Blade Power States']['New'].update(new)
 
     if ret['changes'] == {}:
         ret['comment'] = 'Dell chassis is already in the desired state.'
@@ -190,21 +366,50 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
     name = __salt__[chassis_cmd]('set_chassis_name', name)
     if location:
         location = __salt__[chassis_cmd]('set_chassis_location', location)
+    pw_result = True
+    if 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)
     if mode:
         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():
+        for s in slot_names:
-            slot_name = val.get('slotname')
+            key = s.keys()[0]
-            slot_rets.append(__salt__[chassis_cmd]('set_slotname', key, slot_name))
+            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.'
 
@@ -212,7 +417,7 @@ def chassis(name, location=None, mode=None, idrac_launch=None, slot_names=None,
     return ret
 
 
-def dell_switch(name, ip=None, netmask=None, gateway=None, dhcp=None,
+def switch(name, ip=None, netmask=None, gateway=None, dhcp=None,
                 password=None, snmp=None):
     '''
     Manage switches in a Dell Chassis.
@@ -245,7 +450,7 @@ def dell_switch(name, ip=None, netmask=None, gateway=None, dhcp=None,
     .. code-block:: yaml
 
         my-dell-chassis:
-          chassis.dell_switch:
+          dellchassis.dell_switch:
             - switch: switch-1
             - ip: 192.168.1.1
             - netmask: 255.255.255.0