mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
Add additional functions
This commit is contained in:
twangboy
parent
36507845b6
commit
c6621053fd
@ -23,9 +23,10 @@ def __virtual__():
|
||||
'''
|
||||
Only work on Windows
|
||||
'''
|
||||
if salt.utils.is_windows():
|
||||
return __virtualname__
|
||||
return False
|
||||
if not salt.utils.is_windows():
|
||||
return False, "Only available on Windows systems"
|
||||
|
||||
return __virtualname__
|
||||
|
||||
|
||||
def _install_component(name, component_type, install_name, source=None, limit_access=False):
|
||||
@ -60,9 +61,10 @@ def install_capability(capability, source=None, limit_access=False):
|
||||
|
||||
Args:
|
||||
capability (str): The capability to install
|
||||
source (Optional[str]): The optional source of the capability
|
||||
source (Optional[str]): The optional source of the capability. Default
|
||||
is set by group policy and can be Windows Update.
|
||||
limit_access (Optional[bool]): Prevent DISM from contacting Windows
|
||||
for online images
|
||||
Update for the source package
|
||||
|
||||
Raises:
|
||||
NotImplemented Error for all versions of Windows that are not Windows 10
|
||||
@ -89,7 +91,7 @@ def uninstall_capability(capability):
|
||||
Uninstall a capability
|
||||
|
||||
Args:
|
||||
capability(str): The capability to be uninstalled
|
||||
capability(str): The capability to be removed
|
||||
|
||||
Raises:
|
||||
NotImplemented Error for all versions of Windows that are not Windows 10
|
||||
@ -135,16 +137,49 @@ def installed_capabilities():
|
||||
return _get_components("Capability Identity", "Capabilities", "Installed")
|
||||
|
||||
|
||||
def install_feature(feature, source=None, limit_access=False):
|
||||
def available_capabilities():
|
||||
'''
|
||||
List the capabilities available on the system
|
||||
|
||||
Raises:
|
||||
NotImplemented Error for all versions of Windows that are not Windows 10
|
||||
and later. Server editions of Windows use ServerManager instead.
|
||||
|
||||
Returns:
|
||||
list: A list of available capabilities
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' dism.installed_capabilities
|
||||
'''
|
||||
if salt.utils.version_cmp(__grains__['osversion'], '10') == -1:
|
||||
raise NotImplemented(
|
||||
'`installed_capabilities` is not available on this version of '
|
||||
'Windows: {0}'.format(__grains__['osversion']))
|
||||
return _get_components("Capability Identity", "Capabilities", "Not Present")
|
||||
|
||||
|
||||
def install_feature(feature,
|
||||
package=None,
|
||||
source=None,
|
||||
limit_access=False,
|
||||
enable_parent=False,):
|
||||
'''
|
||||
Install a feature using DISM
|
||||
|
||||
Args:
|
||||
feature (str): The feature to install
|
||||
source (Optional[str]): The path to the source for the feature. If not
|
||||
passed, Windows Update will be used.
|
||||
package (Optional[str]): The parent package for the feature. You do not
|
||||
have to specify the package if it is the Windows Foundation Package.
|
||||
Otherwise, use package to specify the parent package of the feature
|
||||
source (Optional[str]): The optional source of the capability. Default
|
||||
is set by group policy and can be Windows Update
|
||||
limit_access (Optional[bool]): Prevent DISM from contacting Windows
|
||||
Update for online images
|
||||
Update for the source package
|
||||
enable_parent (Optional[bool]): True will enable all parent features of
|
||||
the specified feature
|
||||
|
||||
Returns:
|
||||
dict: A dictionary containing the results of the command
|
||||
@ -155,15 +190,27 @@ def install_feature(feature, source=None, limit_access=False):
|
||||
|
||||
salt '*' dism.install_feature NetFx3
|
||||
'''
|
||||
return _install_component(feature, "Feature", "Enable", source, limit_access)
|
||||
cmd = 'DISM /Online /Enable-Feature /FeatureName:{0}'.format(feature)
|
||||
if package:
|
||||
cmd += ' /PackageName:{0}'.format(package)
|
||||
if source:
|
||||
cmd += ' /Source:{0}'.format(source)
|
||||
if limit_access:
|
||||
cmd += ' /LimitAccess'
|
||||
if enable_parent:
|
||||
cmd += ' /All'
|
||||
|
||||
return __salt__['cmd.run_all'](cmd)
|
||||
|
||||
|
||||
def uninstall_feature(feature):
|
||||
def uninstall_feature(feature, remove_payload=False):
|
||||
'''
|
||||
Uninstall a feature
|
||||
Disables the feature.
|
||||
|
||||
Args:
|
||||
feature (str): The feature to uninstall
|
||||
remove_payload (Optional[bool]): Remove the feature's payload. Must
|
||||
supply source when enabling in the future.
|
||||
|
||||
Returns:
|
||||
dict: A dictionary containing the results of the command
|
||||
@ -174,7 +221,56 @@ def uninstall_feature(feature):
|
||||
|
||||
salt '*' dism.uninstall_feature NetFx3
|
||||
'''
|
||||
return _uninstall_component(feature, "Feature", "Disable")
|
||||
cmd = 'DISM /Online /Disable-Feature /FeatureName:{0}'.format(feature)
|
||||
|
||||
if remove_payload:
|
||||
cmd += ' /Remove'
|
||||
|
||||
return __salt__['cmd.run_all'](cmd)
|
||||
|
||||
|
||||
def get_features(package=None):
|
||||
'''
|
||||
List features
|
||||
|
||||
Args:
|
||||
package (str): The full path to the package. Can be either a .cab file
|
||||
or a folder. Should point to the original source of the package, not
|
||||
to where the file is installed. You cannot use this command to get
|
||||
package information for .msu files
|
||||
|
||||
This can also be the name of a package as listed in
|
||||
``dism.installed_packages``
|
||||
|
||||
Returns:
|
||||
list: A list of features
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
# Return all features on the system
|
||||
salt '*' dism.get_features
|
||||
|
||||
# Return all features in package.cab
|
||||
salt '*' dism.get_features C:\packages\package.cab
|
||||
|
||||
# Return all features in the calc package
|
||||
salt '*' dism.get_features Microsoft.Windows.Calc.Demo~6595b6144ccf1df~x86~en~1.0.0.0
|
||||
'''
|
||||
|
||||
cmd = 'DISM /Online /Get-Features'
|
||||
|
||||
if package:
|
||||
if '~' in package:
|
||||
cmd += ' /PackageName:{0}'.format(package)
|
||||
else:
|
||||
cmd += ' /PackagePath:{0}'.format(package)
|
||||
|
||||
out = __salt__['cmd.run'](cmd)
|
||||
pattern = r'Feature Name : (.*)'
|
||||
capabilities = re.findall(pattern, out, re.MULTILINE)
|
||||
return capabilities
|
||||
|
||||
|
||||
def installed_features():
|
||||
@ -209,6 +305,69 @@ def available_features():
|
||||
return _get_components("Feature Name", "Features", "Disabled")
|
||||
|
||||
|
||||
def install_package(package, ignore_check=False, prevent_pending=False):
|
||||
'''
|
||||
Install a package using DISM
|
||||
|
||||
Args:
|
||||
package (str): The package to install. Can be a .cab file, a .msu file,
|
||||
or a folder
|
||||
ignore_check (Optional[bool]): Skip installation of the package if the
|
||||
applicability checks fail
|
||||
prevent_pending (Optional[bool]): Skip the installation of the package
|
||||
if there are pending online actions
|
||||
|
||||
Returns:
|
||||
dict: A dictionary containing the results of the command
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' dism.install_package C:\Packages\package.cab
|
||||
'''
|
||||
cmd = 'DISM /Online /Quiet /NoRestart /Add-Package ' \
|
||||
'/PackagePath:{0}'.format(package)
|
||||
if ignore_check:
|
||||
cmd += ' /IgnoreCheck'
|
||||
if prevent_pending:
|
||||
cmd += ' /PreventPending'
|
||||
|
||||
return __salt__['cmd.run_all'](cmd)
|
||||
|
||||
|
||||
def uninstall_package(package):
|
||||
'''
|
||||
Uninstall a package
|
||||
|
||||
Args:
|
||||
package (str): The full path to the package. Can be either a .cab file
|
||||
or a folder. Should point to the original source of the package, not
|
||||
to where the file is installed. You cannot use this command to get
|
||||
package information for .msu files
|
||||
|
||||
This can also be the name of a package as listed in
|
||||
``dism.installed_packages``
|
||||
|
||||
Returns:
|
||||
dict: A dictionary containing the results of the command
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' dism.uninstall_package NetFx3
|
||||
'''
|
||||
cmd = 'DISM /Online /Quiet /NoRestart /Remove-Package'
|
||||
|
||||
if '~' in package:
|
||||
cmd += ' /PackageName:{0}'.format(package)
|
||||
else:
|
||||
cmd += ' /PackagePath:{0}'.format(package)
|
||||
|
||||
return __salt__['cmd.run_all'](cmd)
|
||||
|
||||
|
||||
def installed_packages():
|
||||
'''
|
||||
List the packages installed on the system
|
||||
@ -224,3 +383,33 @@ def installed_packages():
|
||||
'''
|
||||
return _get_components("Package Identity", "Features", "Installed")
|
||||
|
||||
|
||||
def package_info(package):
|
||||
'''
|
||||
Display information about a package
|
||||
|
||||
Args:
|
||||
package (str): The full path to the package. Can be either a .cab file
|
||||
or a folder. Should point to the original source of the package, not
|
||||
to where the file is installed. You cannot use this command to get
|
||||
package information for .msu files
|
||||
|
||||
This can also be the name of a package on the image
|
||||
|
||||
Returns:
|
||||
dict: A dictionary containing the results of the command
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' dism. package_info C:\packages\package.cab
|
||||
'''
|
||||
cmd = 'DISM /Online /Quiet /NoRestart /Get-PackageInfo'
|
||||
|
||||
if '~' in package:
|
||||
cmd += ' /PackageName:{0}'.format(package)
|
||||
else:
|
||||
cmd += ' /PackagePath:{0}'.format(package)
|
||||
|
||||
return __salt__['cmd.run_all'](cmd)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user