diff --git a/HISTORY.rst b/HISTORY.rst index ce2f1788..7792d1d5 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,17 @@ History ======= +0.9.14 (2023-12-13) +--------------------- +* Added support for ancient IMCs +* Added support for DNAC DN1 - DN3 servers +* Added support for CNR server +* Added support for Python 3.11 + +0.9.13 (2022-07-21) +--------------------- +* Adds support for IMC version 4.2(2a) + 0.9.12 (2021-10-28) --------------------- * Bug fixes @@ -17,7 +28,7 @@ History 0.9.9 (2020-04-22) --------------------- -* Fixes an issue with version meta +* Fixes an issue with version meta 0.9.8 (2020-04-22) --------------------- diff --git a/imcsdk/__init__.py b/imcsdk/__init__.py index 3eaec401..3b74536e 100644 --- a/imcsdk/__init__.py +++ b/imcsdk/__init__.py @@ -40,7 +40,7 @@ def set_log_level(level=logging.DEBUG): None Example: - from imcsdk import set_log_level + from imcsdk_ecoen66 import set_log_level import logging set_log_level(logging.INFO) @@ -55,6 +55,5 @@ def set_log_level(level=logging.DEBUG): if os.path.exists('/tmp/imcsdk_debug'): enable_file_logging() -__author__ = 'Cisco Systems' -__email__ = 'ucs-python@cisco.com' -__version__ = '0.9.12' +__author__ = '@ecoen66' +__version__ = '0.9.28' diff --git a/imcsdk/apis/admin/certificate.py b/imcsdk/apis/admin/certificate.py index 53243ea8..ca20153a 100644 --- a/imcsdk/apis/admin/certificate.py +++ b/imcsdk/apis/admin/certificate.py @@ -314,7 +314,7 @@ def certificate_signing_request_generate(handle, name, org, locality, state, state="California", locality="San Francisco", self_signed=True) """ - from imcsdk.mometa.generate.GenerateCertificateSigningRequest import \ + from imcsdk_ecoen66.mometa.generate.GenerateCertificateSigningRequest import \ GenerateCertificateSigningRequest mo = GenerateCertificateSigningRequest(parent_mo_or_dn="sys/cert-mgmt") @@ -415,7 +415,7 @@ def certificate_upload(handle, username, password, server, file_name, protocol): None """ - from imcsdk.mometa.upload.UploadCertificate import UploadCertificate, \ + from imcsdk_ecoen66.mometa.upload.UploadCertificate import UploadCertificate, \ UploadCertificateConsts mo = UploadCertificate(parent_mo_or_dn="sys/cert-mgmt") diff --git a/imcsdk/apis/admin/ip.py b/imcsdk/apis/admin/ip.py index c3dcd968..0768c482 100644 --- a/imcsdk/apis/admin/ip.py +++ b/imcsdk/apis/admin/ip.py @@ -16,17 +16,17 @@ This module implements the APIs for IP Blocking and IP Filtering """ import logging -from imcsdk.mometa.ip.IpBlocking import IpBlocking -from imcsdk.mometa.ip.IpFiltering import IpFiltering, IpFilteringConsts -from imcsdk.apis.utils import _get_mo, _is_valid_arg, _is_invalid_value -from imcsdk.imccoreutils import get_server_dn, IMC_PLATFORM -from imcsdk.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.ip.IpBlocking import IpBlocking +from imcsdk_ecoen66.mometa.ip.IpFiltering import IpFiltering, IpFilteringConsts +from imcsdk_ecoen66.apis.utils import _get_mo, _is_valid_arg, _is_invalid_value +from imcsdk_ecoen66.imccoreutils import get_server_dn, IMC_PLATFORM +from imcsdk_ecoen66.imcexception import ImcOperationError log = logging.getLogger('imc') def _get_mgmt_if_dn(handle, id=1): - from imcsdk.mometa.mgmt.MgmtIf import MgmtIf + from imcsdk_ecoen66.mometa.mgmt.MgmtIf import MgmtIf if handle.platform == IMC_PLATFORM.TYPE_CLASSIC: parent_dn = get_server_dn(handle) + '/mgmt' diff --git a/imcsdk/apis/admin/ipmi.py b/imcsdk/apis/admin/ipmi.py index dba5f6d3..f9c2c8b4 100644 --- a/imcsdk/apis/admin/ipmi.py +++ b/imcsdk/apis/admin/ipmi.py @@ -15,8 +15,8 @@ """ This module implements all the communication services """ -from imcsdk.mometa.comm.CommIpmiLan import CommIpmiLan, CommIpmiLanConsts -from imcsdk.imccoreutils import get_server_dn, IMC_PLATFORM +from imcsdk_ecoen66.mometa.comm.CommIpmiLan import CommIpmiLan, CommIpmiLanConsts +from imcsdk_ecoen66.imccoreutils import get_server_dn, IMC_PLATFORM def _get_comm_mo_dn(handle, server_id=1): @@ -24,7 +24,7 @@ def _get_comm_mo_dn(handle, server_id=1): Internal method to get the IPMI mo's parent_dn based \ on the type of platform """ - from imcsdk.imcexception import ImcValidationException + from imcsdk_ecoen66.imcexception import ImcValidationException if handle.platform == IMC_PLATFORM.TYPE_CLASSIC: return("sys/svc-ext") diff --git a/imcsdk/apis/admin/ldap.py b/imcsdk/apis/admin/ldap.py index 1957b9bc..1b1d773b 100644 --- a/imcsdk/apis/admin/ldap.py +++ b/imcsdk/apis/admin/ldap.py @@ -17,10 +17,10 @@ """ import logging -from imcsdk.imcexception import ImcOperationError -from imcsdk.apis.utils import _get_mo, _is_valid_arg, _is_invalid_value -from imcsdk.mometa.aaa.AaaLdap import AaaLdap -from imcsdk.mometa.aaa.AaaLdapRoleGroup import AaaLdapRoleGroup +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.apis.utils import _get_mo, _is_valid_arg, _is_invalid_value +from imcsdk_ecoen66.mometa.aaa.AaaLdap import AaaLdap +from imcsdk_ecoen66.mometa.aaa.AaaLdapRoleGroup import AaaLdapRoleGroup log = logging.getLogger('imc') diff --git a/imcsdk/apis/admin/ntp.py b/imcsdk/apis/admin/ntp.py index feea4642..3958afc4 100644 --- a/imcsdk/apis/admin/ntp.py +++ b/imcsdk/apis/admin/ntp.py @@ -16,8 +16,8 @@ This module implements all the ntp related functionality """ -from imcsdk.imcexception import ImcOperationError -from imcsdk.apis.utils import _get_mo, _is_invalid_value, _is_valid_arg +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.apis.utils import _get_mo, _is_invalid_value, _is_valid_arg import logging diff --git a/imcsdk/apis/admin/redfish.py b/imcsdk/apis/admin/redfish.py index 4983062a..329bf921 100644 --- a/imcsdk/apis/admin/redfish.py +++ b/imcsdk/apis/admin/redfish.py @@ -17,7 +17,7 @@ """ import logging -from imcsdk.mometa.comm.CommRedfish import CommRedfish, CommRedfishConsts +from imcsdk_ecoen66.mometa.comm.CommRedfish import CommRedfish, CommRedfishConsts log = logging.getLogger('imc') diff --git a/imcsdk/apis/admin/snmp.py b/imcsdk/apis/admin/snmp.py index d0afb5dd..c41877cd 100644 --- a/imcsdk/apis/admin/snmp.py +++ b/imcsdk/apis/admin/snmp.py @@ -15,8 +15,8 @@ This module performs the operations related to snmp server, user and traps. """ -from imcsdk.imcexception import ImcOperationError -from imcsdk.apis.utils import _get_mo +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.apis.utils import _get_mo SNMP_DN = 'sys/svc-ext/snmp-svc' @@ -50,7 +50,7 @@ def snmp_enable(handle, community=None, sys_location="user location") """ - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts mo = _get_mo(handle, dn=SNMP_DN) @@ -87,7 +87,7 @@ def snmp_disable(handle): snmp_disable(handle) """ - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts mo = _get_mo(handle, dn=SNMP_DN) @@ -110,7 +110,7 @@ def is_snmp_enabled(handle, **kwargs): Example: is_snmp_enabled(handle) """ - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts mo = _get_mo(handle, dn=SNMP_DN) @@ -123,7 +123,7 @@ def is_snmp_enabled(handle, **kwargs): def _get_free_snmp_trap_obj(handle): - from imcsdk.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts traps = handle.query_children(in_dn=SNMP_DN, class_id="CommSnmpTrap") for trap in traps: @@ -162,7 +162,7 @@ def snmp_trap_add(handle, hostname, port, version="v3", notification_type="informs") """ - from imcsdk.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts mo = _get_free_snmp_trap_obj(handle) @@ -267,7 +267,7 @@ def snmp_trap_remove(handle, trap_id): snmp_trap_remove(handle, trap_id=6) """ - from imcsdk.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts dn = SNMP_DN + '/snmp-trap-' + str(trap_id) mo = _get_mo(handle, dn=dn) @@ -315,7 +315,7 @@ def snmp_user_add(handle, name, security_level="authpriv", auth="MD5", privacy_pwd="xyz", privacy="DES") """ - from imcsdk.mometa.comm.CommSnmpUser import CommSnmpUserConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpUser import CommSnmpUserConsts mo = _get_free_snmp_user(handle) @@ -439,7 +439,7 @@ def snmp_user_remove(handle, name): """ - from imcsdk.mometa.comm.CommSnmpUser import CommSnmpUserConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpUser import CommSnmpUserConsts found_user = snmp_user_get(handle, name=name) if found_user is None: diff --git a/imcsdk/apis/admin/syslog.py b/imcsdk/apis/admin/syslog.py index 2f311511..d724628a 100644 --- a/imcsdk/apis/admin/syslog.py +++ b/imcsdk/apis/admin/syslog.py @@ -15,7 +15,7 @@ This module performs the operations related to system logs """ -from imcsdk.imcexception import ImcOperationError +from imcsdk_ecoen66.imcexception import ImcOperationError SYSLOG_DN = 'sys/svc-ext/syslog' @@ -152,7 +152,7 @@ def syslog_remote_enable(handle, hostname, name="primary", port="514", mo = syslog_remote_enable(handle, hostname="10.10.10.10", name="primary") """ - from imcsdk.mometa.comm.CommSyslogClient import CommSyslogClientConsts + from imcsdk_ecoen66.mometa.comm.CommSyslogClient import CommSyslogClientConsts mo = syslog_remote_get(handle, name, caller="syslog_remote_enable") @@ -184,7 +184,7 @@ def syslog_remote_disable(handle, name): Example: syslog_remote_disable(handle, name) """ - from imcsdk.mometa.comm.CommSyslogClient import CommSyslogClientConsts + from imcsdk_ecoen66.mometa.comm.CommSyslogClient import CommSyslogClientConsts mo = syslog_remote_get(handle, name) mo.admin_state = CommSyslogClientConsts.ADMIN_STATE_DISABLED @@ -207,7 +207,7 @@ def is_syslog_remote_enabled(handle, name, **kwargs): Example: is_syslog_remote_enabled(handle, name) """ - from imcsdk.mometa.comm.CommSyslogClient import CommSyslogClientConsts + from imcsdk_ecoen66.mometa.comm.CommSyslogClient import CommSyslogClientConsts try: mo = syslog_remote_get(handle, name) @@ -236,7 +236,7 @@ def is_syslog_remote_clear(handle, name): Example: issyslog_remote_clear(handle, name) """ - from imcsdk.mometa.comm.CommSyslogClient import CommSyslogClientConsts + from imcsdk_ecoen66.mometa.comm.CommSyslogClient import CommSyslogClientConsts try: mo = syslog_remote_get(handle, name) @@ -269,7 +269,7 @@ def syslog_remote_clear(handle, name): Example: syslog_remote_clear(handle, name) """ - from imcsdk.mometa.comm.CommSyslogClient import CommSyslogClientConsts + from imcsdk_ecoen66.mometa.comm.CommSyslogClient import CommSyslogClientConsts mo = syslog_remote_get(handle, name) mo.admin_action = CommSyslogClientConsts.ADMIN_ACTION_CLEAR diff --git a/imcsdk/apis/admin/user.py b/imcsdk/apis/admin/user.py index 7eb14d9f..1adb9ab8 100644 --- a/imcsdk/apis/admin/user.py +++ b/imcsdk/apis/admin/user.py @@ -17,7 +17,7 @@ """ import logging -from imcsdk.imcexception import ImcOperationError +from imcsdk_ecoen66.imcexception import ImcOperationError log = logging.getLogger('imc') @@ -83,7 +83,7 @@ def password_expiration_set(handle, AaaUserPasswordExpiration object """ - from imcsdk.mometa.aaa.AaaUserPasswordExpiration import \ + from imcsdk_ecoen66.mometa.aaa.AaaUserPasswordExpiration import \ AaaUserPasswordExpiration mo = AaaUserPasswordExpiration(parent_mo_or_dn="sys/user-ext") @@ -110,7 +110,7 @@ def password_expiration_exists(handle, **kwargs): (True, AaaUserPasswordExpiration) is policy exists, else (False, None) """ - from imcsdk.mometa.aaa.AaaUserPasswordExpiration import \ + from imcsdk_ecoen66.mometa.aaa.AaaUserPasswordExpiration import \ AaaUserPasswordExpiration mo = AaaUserPasswordExpiration(parent_mo_or_dn="sys/user-ext") @@ -164,7 +164,7 @@ def _get_local_user(handle, name): def _get_free_user_id(handle): - from imcsdk.mometa.aaa.AaaUser import AaaUserConsts + from imcsdk_ecoen66.mometa.aaa.AaaUser import AaaUserConsts users = _get_local_users(handle) for user in users: if user.account_status == AaaUserConsts.ACCOUNT_STATUS_INACTIVE and \ @@ -192,7 +192,7 @@ def local_user_create(handle, name, pwd, priv="read-only"): Exception when limit on the number of users has exceeded """ - from imcsdk.mometa.aaa.AaaUser import AaaUser, AaaUserConsts + from imcsdk_ecoen66.mometa.aaa.AaaUser import AaaUser, AaaUserConsts # (1) local_user_exists(handle, name, pwd, priv) would be used by Ansible. # (2) local_user_exists(handle, name) would be used by user scripts. @@ -278,7 +278,7 @@ def local_user_delete(handle, name): ImcOperationError if the user is not found """ - from imcsdk.mometa.aaa.AaaUser import AaaUserConsts + from imcsdk_ecoen66.mometa.aaa.AaaUser import AaaUserConsts found_user = _get_local_user(handle, name=name) if found_user is None: diff --git a/imcsdk/apis/server/adaptor.py b/imcsdk/apis/server/adaptor.py index 2cb69016..5241f7d9 100644 --- a/imcsdk/apis/server/adaptor.py +++ b/imcsdk/apis/server/adaptor.py @@ -17,8 +17,8 @@ and create vnics and vhbas """ -from imcsdk.imccoreutils import get_server_dn -from imcsdk.apis.utils import _get_mo +from imcsdk_ecoen66.imccoreutils import get_server_dn +from imcsdk_ecoen66.apis.utils import _get_mo def _get_adaptor_dn(handle, adaptor_slot, server_id=1): @@ -104,7 +104,7 @@ def adaptor_properties_set(handle, adaptor_slot, lldp=None, fip_mode=None, AdaptorGenProfile object """ - from imcsdk.mometa.adaptor.AdaptorGenProfile import AdaptorGenProfile + from imcsdk_ecoen66.mometa.adaptor.AdaptorGenProfile import AdaptorGenProfile adaptor = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) mo = AdaptorGenProfile(parent_mo_or_dn=adaptor.dn) # VMFEX feature support is discontinued since 3.0(1c) release @@ -135,7 +135,7 @@ def adaptor_reset(handle, adaptor_slot, server_id=1, **kwargs): AdaptorUnit object """ - from imcsdk.mometa.adaptor.AdaptorUnit import AdaptorUnitConsts + from imcsdk_ecoen66.mometa.adaptor.AdaptorUnit import AdaptorUnitConsts mo = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) mo.admin_state = AdaptorUnitConsts.ADMIN_STATE_ADAPTOR_RESET handle.set_mo(mo) @@ -156,7 +156,7 @@ def vnic_get(handle, adaptor_slot, name, server_id=1, **kwargs): AdaptorHostEthIf object """ - from imcsdk.mometa.adaptor.AdaptorHostEthIf import AdaptorHostEthIf + from imcsdk_ecoen66.mometa.adaptor.AdaptorHostEthIf import AdaptorHostEthIf mo = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) vnic_mo = AdaptorHostEthIf(parent_mo_or_dn=mo.dn, name=name) @@ -206,7 +206,7 @@ def vnic_create(handle, AdaptorHostEthIf object """ - from imcsdk.mometa.adaptor.AdaptorHostEthIf import AdaptorHostEthIf + from imcsdk_ecoen66.mometa.adaptor.AdaptorHostEthIf import AdaptorHostEthIf mo = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) vnic = AdaptorHostEthIf(parent_mo_or_dn=mo.dn, name=name) @@ -260,7 +260,7 @@ def vhba_get(handle, adaptor_slot, name, server_id=1, **kwargs): AdaptorHostEthIf object """ - from imcsdk.mometa.adaptor.AdaptorHostFcIf import AdaptorHostFcIf + from imcsdk_ecoen66.mometa.adaptor.AdaptorHostFcIf import AdaptorHostFcIf mo = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) vhba_mo = AdaptorHostFcIf(parent_mo_or_dn=mo.dn, name=name) @@ -299,7 +299,7 @@ def vhba_create(handle, adaptor_slot, name, channel_number, wwnn, wwpn, san_boot=True, uplink_port=0, server_id=2) """ - from imcsdk.mometa.adaptor.AdaptorHostFcIf import AdaptorHostFcIf + from imcsdk_ecoen66.mometa.adaptor.AdaptorHostFcIf import AdaptorHostFcIf mo = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) vhba_mo = AdaptorHostFcIf(parent_mo_or_dn=mo.dn, name=name) diff --git a/imcsdk/apis/server/bios.py b/imcsdk/apis/server/bios.py index 9c09db27..337461df 100644 --- a/imcsdk/apis/server/bios.py +++ b/imcsdk/apis/server/bios.py @@ -18,9 +18,9 @@ import logging import json -import imcsdk.imccoreutils as imccoreutils -from imcsdk.imcexception import ImcOperationError -from imcsdk.apis.utils import _is_valid_arg +import imcsdk_ecoen66.imccoreutils as imccoreutils +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.apis.utils import _is_valid_arg log = logging.getLogger('imc') @@ -70,8 +70,8 @@ def bios_profile_backup_running(handle, server_id=1, **kwargs): bios_profile_backup_running(handle, server_id=1) """ - from imcsdk.mometa.bios.BiosProfileManagement import BiosProfileManagement - from imcsdk.mometa.bios.BiosProfileManagement import \ + from imcsdk_ecoen66.mometa.bios.BiosProfileManagement import BiosProfileManagement + from imcsdk_ecoen66.mometa.bios.BiosProfileManagement import \ BiosProfileManagementConsts mo = BiosProfileManagement(parent_mo_or_dn=_get_bios_dn(handle, server_id)) @@ -108,7 +108,7 @@ def bios_profile_upload(handle, remote_server, remote_file, protocol='tftp', user='abcd', pwd='pqrs') """ - from imcsdk.mometa.upload.UploadBiosProfile import UploadBiosProfile + from imcsdk_ecoen66.mometa.upload.UploadBiosProfile import UploadBiosProfile bios_dn = _get_bios_dn(handle, server_id=server_id) mo = UploadBiosProfile( parent_mo_or_dn=bios_dn + '/profile-mgmt') @@ -179,7 +179,7 @@ def bios_profile_activate(handle, name, backup_on_activate=True, reboot_on_activate=False) """ - from imcsdk.mometa.bios.BiosProfile import BiosProfileConsts + from imcsdk_ecoen66.mometa.bios.BiosProfile import BiosProfileConsts mo = _get_bios_profile(handle, name=name, server_id=server_id) params = { 'backup_on_activate': ('no', 'yes')[backup_on_activate], @@ -213,7 +213,7 @@ def bios_profile_delete(handle, name, server_id=1): Examples: bios_profile_delete(handle, name='simple', server_id=2) """ - from imcsdk.mometa.bios.BiosProfile import BiosProfileConsts + from imcsdk_ecoen66.mometa.bios.BiosProfile import BiosProfileConsts mo = _get_bios_profile(handle, name=name, server_id=server_id) mo.admin_action = BiosProfileConsts.ADMIN_ACTION_DELETE handle.set_mo(mo) @@ -343,7 +343,7 @@ def bios_tokens_set(handle, tokens={}, server_id=1): server_id=2) """ - from imcsdk.imccoreutils import load_class + from imcsdk_ecoen66.imccoreutils import load_class parent_dn = _get_bios_dn(handle, server_id) + "/bios-settings" mo_table = _get_bios_mo_table(handle, tokens, server_id) @@ -399,7 +399,7 @@ def bios_tokens_exist(handle, tokens={}, server_id=1): def _get_bios_mo_table(handle, tokens={}, server_id=1): - from imcsdk.imcbiostables import bios_tokens_table + from imcsdk_ecoen66.imcbiostables import bios_tokens_table mo_table = {} diff --git a/imcsdk/apis/server/boot.py b/imcsdk/apis/server/boot.py index 1cde0df2..3378e5df 100644 --- a/imcsdk/apis/server/boot.py +++ b/imcsdk/apis/server/boot.py @@ -17,8 +17,8 @@ """ import logging -import imcsdk.imccoreutils as imccoreutils -from imcsdk.mometa.lsboot.LsbootDevPrecision import LsbootDevPrecision +import imcsdk_ecoen66.imccoreutils as imccoreutils +from imcsdk_ecoen66.mometa.lsboot.LsbootDevPrecision import LsbootDevPrecision log = logging.getLogger('imc') @@ -143,7 +143,7 @@ def _get_device_type(policy_type, in_device): def _get_device(parent_dn, device_type, device_name): - from imcsdk.imccoreutils import load_class + from imcsdk_ecoen66.imccoreutils import load_class if _is_boot_order_precision(parent_dn): if device_type not in precision_device_dict: @@ -277,7 +277,7 @@ def boot_order_precision_set( def boot_precision_configured_get(handle, server_id=1): - from imcsdk.imccoreutils import get_server_dn + from imcsdk_ecoen66.imccoreutils import get_server_dn configured_boot_order = [] @@ -297,8 +297,8 @@ def boot_precision_configured_get(handle, server_id=1): def boot_order_precision_exists(handle, **kwargs): - from imcsdk.imccoreutils import _set_server_dn - from imcsdk.apis.utils import _is_valid_arg + from imcsdk_ecoen66.imccoreutils import _set_server_dn + from imcsdk_ecoen66.apis.utils import _is_valid_arg server_dn = _set_server_dn(handle, kwargs) mos = handle.query_children(in_dn=server_dn, @@ -351,7 +351,7 @@ def boot_order_policy_get(handle, dump=False, server_id=1): boot_order_policy_get(handle, dump=False) """ - from imcsdk.mometa.lsboot.LsbootBootSecurity import LsbootBootSecurity + from imcsdk_ecoen66.mometa.lsboot.LsbootBootSecurity import LsbootBootSecurity server_dn = imccoreutils.get_server_dn(handle, server_id) parent_dn = server_dn + "/boot-policy" @@ -432,8 +432,8 @@ def boot_order_policy_set(handle, reboot_on_update="no", # IMC expects the devices to be configured in sorted order boot_devices = sorted(boot_devices, key=lambda x: x["order"]) - from imcsdk.mometa.lsboot.LsbootDef import LsbootDef - from imcsdk.mometa.lsboot.LsbootBootSecurity import LsbootBootSecurity + from imcsdk_ecoen66.mometa.lsboot.LsbootDef import LsbootDef + from imcsdk_ecoen66.mometa.lsboot.LsbootBootSecurity import LsbootBootSecurity server_dn = imccoreutils.get_server_dn(handle, server_id) diff --git a/imcsdk/apis/server/health.py b/imcsdk/apis/server/health.py index 90fa818f..8bc31688 100644 --- a/imcsdk/apis/server/health.py +++ b/imcsdk/apis/server/health.py @@ -35,7 +35,7 @@ def faults_get(handle, parent_class_id=None, dump=False): faults_get(handle, dump=True) """ - from imcsdk.imccoreutils import write_object + from imcsdk_ecoen66.imccoreutils import write_object if parent_class_id: fault_list = [] diff --git a/imcsdk/apis/server/inventory.py b/imcsdk/apis/server/inventory.py index d18081d9..967cee81 100644 --- a/imcsdk/apis/server/inventory.py +++ b/imcsdk/apis/server/inventory.py @@ -16,7 +16,7 @@ """ import json -from imcsdk.imcexception import ImcOperationError +from imcsdk_ecoen66.imcexception import ImcOperationError inventory_spec = { "cpu": { diff --git a/imcsdk/apis/server/kvm.py b/imcsdk/apis/server/kvm.py index a16c195b..a304fe33 100644 --- a/imcsdk/apis/server/kvm.py +++ b/imcsdk/apis/server/kvm.py @@ -17,8 +17,8 @@ import re -from imcsdk.mometa.comm.CommKvm import CommKvm -from imcsdk.apis.admin.ipmi import _get_comm_mo_dn +from imcsdk_ecoen66.mometa.comm.CommKvm import CommKvm +from imcsdk_ecoen66.apis.admin.ipmi import _get_comm_mo_dn CIFS_URI_PATTERN = re.compile('^//\d+\.\d+\.\d+\.\d+\/') NFS_URI_PATTERN = re.compile('^\d+\.\d+\.\d+\.\d+\:\/') diff --git a/imcsdk/apis/server/power.py b/imcsdk/apis/server/power.py index 6c73c8a5..b9fce076 100644 --- a/imcsdk/apis/server/power.py +++ b/imcsdk/apis/server/power.py @@ -15,10 +15,10 @@ This module implements apis for power policy and power cap related config """ -from imcsdk.imccoreutils import get_server_dn -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.power.PowerBudget import PowerBudget, PowerBudgetConsts -from imcsdk.mometa.standard.StandardPowerProfile import StandardPowerProfile +from imcsdk_ecoen66.imccoreutils import get_server_dn +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.power.PowerBudget import PowerBudget, PowerBudgetConsts +from imcsdk_ecoen66.mometa.standard.StandardPowerProfile import StandardPowerProfile import logging log = logging.getLogger('imc') diff --git a/imcsdk/apis/server/serveractions.py b/imcsdk/apis/server/serveractions.py index 6b07c713..fd61b563 100644 --- a/imcsdk/apis/server/serveractions.py +++ b/imcsdk/apis/server/serveractions.py @@ -17,17 +17,17 @@ """ import time -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.compute.ComputeRackUnit import ComputeRackUnit,\ +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.compute.ComputeRackUnit import ComputeRackUnit,\ ComputeRackUnitConsts -from imcsdk.mometa.equipment.EquipmentChassis import EquipmentChassis -from imcsdk.mometa.compute.ComputeServerNode import ComputeServerNodeConsts -from imcsdk.mometa.equipment.EquipmentLocatorLed \ +from imcsdk_ecoen66.mometa.equipment.EquipmentChassis import EquipmentChassis +from imcsdk_ecoen66.mometa.compute.ComputeServerNode import ComputeServerNodeConsts +from imcsdk_ecoen66.mometa.equipment.EquipmentLocatorLed \ import EquipmentLocatorLed, EquipmentLocatorLedConsts -from imcsdk.mometa.equipment.EquipmentChassisLocatorLed \ +from imcsdk_ecoen66.mometa.equipment.EquipmentChassisLocatorLed \ import EquipmentChassisLocatorLed, EquipmentChassisLocatorLedConsts -from imcsdk.imccoreutils import get_server_dn, IMC_PLATFORM, _set_server_dn -from imcsdk.apis.utils import _is_valid_arg +from imcsdk_ecoen66.imccoreutils import get_server_dn, IMC_PLATFORM, _set_server_dn +from imcsdk_ecoen66.apis.utils import _is_valid_arg def _set_power_state(handle, server_dn, state): diff --git a/imcsdk/apis/server/sol.py b/imcsdk/apis/server/sol.py index 235ceb9e..8d4c8847 100644 --- a/imcsdk/apis/server/sol.py +++ b/imcsdk/apis/server/sol.py @@ -16,9 +16,9 @@ This module implements all the sol related config """ -from imcsdk.imcexception import ImcOperationError -from imcsdk.imccoreutils import get_server_dn -from imcsdk.mometa.sol.SolIf import SolIfConsts +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.imccoreutils import get_server_dn +from imcsdk_ecoen66.mometa.sol.SolIf import SolIfConsts def sol_get(handle, server_id=1, caller="sol_get"): diff --git a/imcsdk/apis/server/storage.py b/imcsdk/apis/server/storage.py index 6c85f0e2..0d95ded7 100644 --- a/imcsdk/apis/server/storage.py +++ b/imcsdk/apis/server/storage.py @@ -19,14 +19,14 @@ import math import logging -import imcsdk.imccoreutils as imccoreutils -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.storage.StorageVirtualDriveCreatorUsingUnusedPhysicalDrive \ +import imcsdk_ecoen66.imccoreutils as imccoreutils +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.storage.StorageVirtualDriveCreatorUsingUnusedPhysicalDrive \ import StorageVirtualDriveCreatorUsingUnusedPhysicalDrive as vd_creator -from imcsdk.mometa.self.SelfEncryptStorageController import \ +from imcsdk_ecoen66.mometa.self.SelfEncryptStorageController import \ SelfEncryptStorageController, SelfEncryptStorageControllerConsts -from imcsdk.mometa.storage.StorageLocalDisk import StorageLocalDiskConsts -from imcsdk.mometa.storage.StorageController import StorageControllerConsts +from imcsdk_ecoen66.mometa.storage.StorageLocalDisk import StorageLocalDiskConsts +from imcsdk_ecoen66.mometa.storage.StorageController import StorageControllerConsts log = logging.getLogger('imc') @@ -364,7 +364,7 @@ def virtual_drive_encryption_enable(handle, controller_type, Examples: virtual_drive_encryption_enable(handle, 'SAS', 'HBA', 'test_vd') """ - from imcsdk.mometa.storage.StorageVirtualDrive import \ + from imcsdk_ecoen66.mometa.storage.StorageVirtualDrive import \ StorageVirtualDriveConsts vd = vd_query_by_name(handle=handle, controller_type=controller_type, @@ -395,7 +395,7 @@ def virtual_drive_set_boot_drive(handle, controller_type, controller_slot, name, Examples: virtual_drive_set_boot_drive(handle, 'SAS', 'HBA', 'test_vd') """ - from imcsdk.mometa.storage.StorageVirtualDrive import \ + from imcsdk_ecoen66.mometa.storage.StorageVirtualDrive import \ StorageVirtualDriveConsts vd = vd_query_by_name(handle=handle, controller_type=controller_type, @@ -523,7 +523,7 @@ def controller_encryption_enable(handle, controller_type, controller_slot='HBA'', key_id='*****', security_key='*****') """ - from imcsdk.mometa.self.SelfEncryptStorageController import \ + from imcsdk_ecoen66.mometa.self.SelfEncryptStorageController import \ SelfEncryptStorageController, SelfEncryptStorageControllerConsts enabled, mo = controller_encryption_exists(handle, diff --git a/imcsdk/apis/server/vmedia.py b/imcsdk/apis/server/vmedia.py index 6979a95a..b3e36342 100644 --- a/imcsdk/apis/server/vmedia.py +++ b/imcsdk/apis/server/vmedia.py @@ -20,10 +20,10 @@ import re import logging -from imcsdk.mometa.comm.CommVMedia import CommVMedia -from imcsdk.mometa.comm.CommVMediaMap import CommVMediaMap -from imcsdk.imcexception import ImcOperationError -from imcsdk.apis.admin.ipmi import _get_comm_mo_dn +from imcsdk_ecoen66.mometa.comm.CommVMedia import CommVMedia +from imcsdk_ecoen66.mometa.comm.CommVMediaMap import CommVMediaMap +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.apis.admin.ipmi import _get_comm_mo_dn from six.moves import urllib diff --git a/imcsdk/apis/utils.py b/imcsdk/apis/utils.py index ad5a9788..2e8ed830 100644 --- a/imcsdk/apis/utils.py +++ b/imcsdk/apis/utils.py @@ -13,7 +13,7 @@ import logging -from imcsdk.imcexception import ImcOperationError +from imcsdk_ecoen66.imcexception import ImcOperationError log = logging.getLogger('imc') diff --git a/imcsdk/apis/v2/admin/certificate.py b/imcsdk/apis/v2/admin/certificate.py index 53243ea8..ca20153a 100644 --- a/imcsdk/apis/v2/admin/certificate.py +++ b/imcsdk/apis/v2/admin/certificate.py @@ -314,7 +314,7 @@ def certificate_signing_request_generate(handle, name, org, locality, state, state="California", locality="San Francisco", self_signed=True) """ - from imcsdk.mometa.generate.GenerateCertificateSigningRequest import \ + from imcsdk_ecoen66.mometa.generate.GenerateCertificateSigningRequest import \ GenerateCertificateSigningRequest mo = GenerateCertificateSigningRequest(parent_mo_or_dn="sys/cert-mgmt") @@ -415,7 +415,7 @@ def certificate_upload(handle, username, password, server, file_name, protocol): None """ - from imcsdk.mometa.upload.UploadCertificate import UploadCertificate, \ + from imcsdk_ecoen66.mometa.upload.UploadCertificate import UploadCertificate, \ UploadCertificateConsts mo = UploadCertificate(parent_mo_or_dn="sys/cert-mgmt") diff --git a/imcsdk/apis/v2/admin/ip.py b/imcsdk/apis/v2/admin/ip.py index 0c7f17b8..32117c6b 100644 --- a/imcsdk/apis/v2/admin/ip.py +++ b/imcsdk/apis/v2/admin/ip.py @@ -16,17 +16,17 @@ This module implements the APIs for IP Blocking and IP Filtering """ import logging -from imcsdk.mometa.ip.IpBlocking import IpBlocking -from imcsdk.mometa.ip.IpFiltering import IpFiltering, IpFilteringConsts -from imcsdk.apis.v2.utils import _get_mo, _is_valid_arg, _is_invalid_value -from imcsdk.imccoreutils import get_server_dn, IMC_PLATFORM -from imcsdk.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.ip.IpBlocking import IpBlocking +from imcsdk_ecoen66.mometa.ip.IpFiltering import IpFiltering, IpFilteringConsts +from imcsdk_ecoen66.apis.v2.utils import _get_mo, _is_valid_arg, _is_invalid_value +from imcsdk_ecoen66.imccoreutils import get_server_dn, IMC_PLATFORM +from imcsdk_ecoen66.imcexception import ImcOperationError log = logging.getLogger('imc') def _get_mgmt_if_dn(handle, id=1): - from imcsdk.mometa.mgmt.MgmtIf import MgmtIf + from imcsdk_ecoen66.mometa.mgmt.MgmtIf import MgmtIf if handle.platform == IMC_PLATFORM.TYPE_CLASSIC: parent_dn = get_server_dn(handle) + '/mgmt' diff --git a/imcsdk/apis/v2/admin/ipmi.py b/imcsdk/apis/v2/admin/ipmi.py index 97249767..c45e3f6b 100644 --- a/imcsdk/apis/v2/admin/ipmi.py +++ b/imcsdk/apis/v2/admin/ipmi.py @@ -15,8 +15,8 @@ """ This module implements all the communication services """ -from imcsdk.mometa.comm.CommIpmiLan import CommIpmiLan -from imcsdk.imccoreutils import get_server_dn, IMC_PLATFORM +from imcsdk_ecoen66.mometa.comm.CommIpmiLan import CommIpmiLan +from imcsdk_ecoen66.imccoreutils import get_server_dn, IMC_PLATFORM def _get_comm_mo_dn(handle, server_id=1): @@ -24,7 +24,7 @@ def _get_comm_mo_dn(handle, server_id=1): Internal method to get the IPMI mo's parent_dn based \ on the type of platform """ - from imcsdk.imcexception import ImcValidationException + from imcsdk_ecoen66.imcexception import ImcValidationException if handle.platform == IMC_PLATFORM.TYPE_CLASSIC: return("sys/svc-ext") @@ -56,13 +56,13 @@ def ipmi_enable(handle, priv=None, key=None, server_id=1): print("IPMI Enabled") """ - from imcsdk.imcexception import ImcOperationError + from imcsdk_ecoen66.imcexception import ImcOperationError # Enable policy if only user mode is ipmi mos = handle.query_classid(class_id="AaaUserPolicy") userPolicy = mos[0] if userPolicy.user_mode != None and userPolicy.user_mode == 'non-ipmi': - raise ImcOperationError("Enable IPMI over LAN", + raise ImcOperationError("Enable IPMI over LAN", "IPMI user mode is disabled on the endpoint.") # Verify key is a hex number diff --git a/imcsdk/apis/v2/admin/ldap.py b/imcsdk/apis/v2/admin/ldap.py index 47bb562b..1cf0cc01 100644 --- a/imcsdk/apis/v2/admin/ldap.py +++ b/imcsdk/apis/v2/admin/ldap.py @@ -17,14 +17,14 @@ """ import logging -from imcsdk.imcexception import ImcOperationError -from imcsdk.imcexception import ImcOperationErrorDetail -from imcsdk.imccoreutils import process_conf_mos_response -from imcsdk.imccoreutils import ConfigConfMosConstants as ccmconst -from imcsdk.imccoreutils import sanitize_message -from imcsdk.apis.v2.utils import _get_mo, _is_valid_arg, _is_invalid_value,\ +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.imcexception import ImcOperationErrorDetail +from imcsdk_ecoen66.imccoreutils import process_conf_mos_response +from imcsdk_ecoen66.imccoreutils import ConfigConfMosConstants as ccmconst +from imcsdk_ecoen66.imccoreutils import sanitize_message +from imcsdk_ecoen66.apis.v2.utils import _get_mo, _is_valid_arg, _is_invalid_value,\ _validate_api_prop -from imcsdk.mometa.aaa.AaaLdapRoleGroup import AaaLdapRoleGroup +from imcsdk_ecoen66.mometa.aaa.AaaLdapRoleGroup import AaaLdapRoleGroup log = logging.getLogger('imc') diff --git a/imcsdk/apis/v2/admin/network.py b/imcsdk/apis/v2/admin/network.py index 7b067a43..e072c02e 100644 --- a/imcsdk/apis/v2/admin/network.py +++ b/imcsdk/apis/v2/admin/network.py @@ -15,9 +15,9 @@ """ This module implements all the services """ -from imcsdk.imcexception import ImcOperationError, ImcValidationException -from imcsdk.imccoreutils import IMC_PLATFORM -from imcsdk.apis.v2.utils import _is_valid_arg +from imcsdk_ecoen66.imcexception import ImcOperationError, ImcValidationException +from imcsdk_ecoen66.imccoreutils import IMC_PLATFORM +from imcsdk_ecoen66.apis.v2.utils import _is_valid_arg def _get_mgmtif_mo_dn(handle): diff --git a/imcsdk/apis/v2/admin/ntp.py b/imcsdk/apis/v2/admin/ntp.py index 009d4a84..0c147931 100644 --- a/imcsdk/apis/v2/admin/ntp.py +++ b/imcsdk/apis/v2/admin/ntp.py @@ -16,8 +16,8 @@ This module implements all the ntp related functionality """ -from imcsdk.imcexception import ImcOperationError -from imcsdk.apis.v2.utils import _get_mo, _is_invalid_value, _is_valid_arg +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.apis.v2.utils import _get_mo, _is_invalid_value, _is_valid_arg import logging diff --git a/imcsdk/apis/v2/admin/redfish.py b/imcsdk/apis/v2/admin/redfish.py index 4983062a..329bf921 100644 --- a/imcsdk/apis/v2/admin/redfish.py +++ b/imcsdk/apis/v2/admin/redfish.py @@ -17,7 +17,7 @@ """ import logging -from imcsdk.mometa.comm.CommRedfish import CommRedfish, CommRedfishConsts +from imcsdk_ecoen66.mometa.comm.CommRedfish import CommRedfish, CommRedfishConsts log = logging.getLogger('imc') diff --git a/imcsdk/apis/v2/admin/smtp.py b/imcsdk/apis/v2/admin/smtp.py index cca22a72..3de94a47 100644 --- a/imcsdk/apis/v2/admin/smtp.py +++ b/imcsdk/apis/v2/admin/smtp.py @@ -15,10 +15,10 @@ This module implements all the smtp related functionality """ -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.mail.MailRecipient import MailRecipientConsts -from imcsdk.mometa.comm.CommMailAlert import CommMailAlertConsts -from imcsdk.apis.v2.utils import _get_mo, _is_invalid_value +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.mail.MailRecipient import MailRecipientConsts +from imcsdk_ecoen66.mometa.comm.CommMailAlert import CommMailAlertConsts +from imcsdk_ecoen66.apis.v2.utils import _get_mo, _is_invalid_value import logging diff --git a/imcsdk/apis/v2/admin/snmp.py b/imcsdk/apis/v2/admin/snmp.py index 91f2a7dd..2d933624 100644 --- a/imcsdk/apis/v2/admin/snmp.py +++ b/imcsdk/apis/v2/admin/snmp.py @@ -18,13 +18,13 @@ import datetime import logging -from imcsdk.imcexception import ImcOperationError, ImcOperationErrorDetail -from imcsdk.imcexception import ImcException -from imcsdk.apis.v2.utils import _get_mo -from imcsdk.imccoreutils import process_conf_mos_response, sanitize_message -from imcsdk.apis.v2.versionconstraints.snmp import \ +from imcsdk_ecoen66.imcexception import ImcOperationError, ImcOperationErrorDetail +from imcsdk_ecoen66.imcexception import ImcException +from imcsdk_ecoen66.apis.v2.utils import _get_mo +from imcsdk_ecoen66.imccoreutils import process_conf_mos_response, sanitize_message +from imcsdk_ecoen66.apis.v2.versionconstraints.snmp import \ snmp_multiple_config_with_configcommit_for_hp_and_above -from imcsdk.apis.v2.versionconstraints.snmp import \ +from imcsdk_ecoen66.apis.v2.versionconstraints.snmp import \ snmp_commit_explicitly_for_hp_and_above @@ -70,7 +70,7 @@ def _reset(handle, local_mo, community, trap_community, engine_id_key): ''' import random - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts input_params = locals() mo = _get_mo(handle, dn=SNMP_DN) @@ -125,7 +125,7 @@ def snmp_enable(handle, port=None, community=None, sys_contact="user contact", sys_location="user location") """ - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts mo = _get_mo(handle, dn=SNMP_DN) @@ -167,7 +167,7 @@ def snmp_disable(handle): Example: snmp_disable(handle) """ - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts mo = _get_mo(handle, dn=SNMP_DN) mo.admin_state = CommSnmpConsts.ADMIN_STATE_DISABLED @@ -189,7 +189,7 @@ def snmp_exists(handle, **kwargs): Example: snmp_exists(handle) """ - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts mo = _get_mo(handle, dn=SNMP_DN) kwargs['admin_state'] = CommSnmpConsts.ADMIN_STATE_ENABLED @@ -245,7 +245,7 @@ def snmp_trap_add(handle, hostname, version, notification_type, version="v2c", notification_type="informs") """ - from imcsdk.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts if version == CommSnmpTrapConsts.VERSION_V2C and user: user = None @@ -291,7 +291,7 @@ def snmp_trap_exists(handle, hostname, **kwargs): user="username") """ - from imcsdk.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts mo = snmp_trap_get(handle, hostname) if mo is None: @@ -350,7 +350,7 @@ def snmp_trap_delete(handle, hostname): Example: snmp_trap_delete(handle, trap_id=6) """ - from imcsdk.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts mo = snmp_trap_get(handle, hostname) mo.admin_state = CommSnmpTrapConsts.ADMIN_STATE_DISABLED @@ -385,9 +385,9 @@ def snmp_trap_add_all(handle, traps=None): notification_type:"informs"}] ) """ - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts - from imcsdk.mometa.comm.CommSnmpTrap import CommSnmpTrap - from imcsdk.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpTrap import CommSnmpTrap + from imcsdk_ecoen66.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts api = 'snmp_trap_add_all' parent_mo = _get_mo(handle, dn=SNMP_DN) @@ -493,8 +493,8 @@ def snmp_trap_delete_all(handle): Example: snmp_trap_delete_all(handle) """ - from imcsdk.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpTrap import CommSnmpTrapConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts api = 'snmp_trap_delete_all' parent_mo = _get_mo(handle, dn=SNMP_DN) @@ -613,7 +613,7 @@ def snmp_user_add(handle, name, security_level, auth="MD5", privacy_pwd="xyz", privacy="DES") """ - from imcsdk.mometa.comm.CommSnmpUser import CommSnmpUserConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpUser import CommSnmpUserConsts auth_type = ( CommSnmpUserConsts.SECURITY_LEVEL_AUTHNOPRIV, @@ -678,7 +678,7 @@ def snmp_user_exists(handle, name, security_level, change_auth_pwd=False, Example: snmp_user_exists(handle, name="snmpuser") """ - from imcsdk.mometa.comm.CommSnmpUser import CommSnmpUserConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpUser import CommSnmpUserConsts mo = snmp_user_get(handle, name) if mo is None: @@ -751,7 +751,7 @@ def snmp_user_delete(handle, name): snmp_user_delete(handle, name="snmpuser") """ - from imcsdk.mometa.comm.CommSnmpUser import CommSnmpUserConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpUser import CommSnmpUserConsts mo = snmp_user_get(handle, name=name) if mo is None: @@ -812,9 +812,9 @@ def snmp_user_add_all(handle, users=None): 'auth': 'MD5', 'auth_pwd': 'password', 'privacy': 'AES', 'privacy_pwd': 'password']) """ - from imcsdk.mometa.comm.CommSnmpUser import CommSnmpUser - from imcsdk.mometa.comm.CommSnmpUser import CommSnmpUserConsts - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpUser import CommSnmpUser + from imcsdk_ecoen66.mometa.comm.CommSnmpUser import CommSnmpUserConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts api = 'snmp_user_add_all' parent_mo = _get_mo(handle, dn=SNMP_DN) @@ -913,8 +913,8 @@ def snmp_user_delete_all(handle): snmp_user_delete_all(handle) """ - from imcsdk.mometa.comm.CommSnmpUser import CommSnmpUserConsts - from imcsdk.mometa.comm.CommSnmp import CommSnmpConsts + from imcsdk_ecoen66.mometa.comm.CommSnmpUser import CommSnmpUserConsts + from imcsdk_ecoen66.mometa.comm.CommSnmp import CommSnmpConsts api = 'snmp_user_delete_all' parent_mo = _get_mo(handle, dn=SNMP_DN) diff --git a/imcsdk/apis/v2/admin/ssh.py b/imcsdk/apis/v2/admin/ssh.py index f9d6e378..0eadc0a5 100644 --- a/imcsdk/apis/v2/admin/ssh.py +++ b/imcsdk/apis/v2/admin/ssh.py @@ -15,8 +15,8 @@ This module implements all the ssh related functionality """ -from imcsdk.apis.v2.utils import _get_mo -from imcsdk.imcexception import ImcOperationError +from imcsdk_ecoen66.apis.v2.utils import _get_mo +from imcsdk_ecoen66.imcexception import ImcOperationError import logging @@ -43,7 +43,7 @@ def ssh_enable(handle, port=None, session_timeout=None, **kwargs): Example: ssh_enable(handle, 22, 120) """ - from imcsdk.mometa.comm.CommSsh import CommSshConsts + from imcsdk_ecoen66.mometa.comm.CommSsh import CommSshConsts mo = _get_mo(handle, dn=_SSH_DN) params = { @@ -73,7 +73,7 @@ def ssh_disable(handle): Example: ssh_disable(handle) """ - from imcsdk.mometa.comm.CommSsh import CommSshConsts + from imcsdk_ecoen66.mometa.comm.CommSsh import CommSshConsts mo = _get_mo(handle, dn=_SSH_DN) mo.admin_state = CommSshConsts.ADMIN_STATE_DISABLED @@ -95,7 +95,7 @@ def ssh_exists(handle, **kwargs): Example: ssh_exists(handle) """ - from imcsdk.mometa.comm.CommSsh import CommSshConsts + from imcsdk_ecoen66.mometa.comm.CommSsh import CommSshConsts try: mo = _get_mo(handle, dn=_SSH_DN) diff --git a/imcsdk/apis/v2/admin/syslog.py b/imcsdk/apis/v2/admin/syslog.py index 29387a26..f5ca21b9 100644 --- a/imcsdk/apis/v2/admin/syslog.py +++ b/imcsdk/apis/v2/admin/syslog.py @@ -15,8 +15,8 @@ This module performs the operations related to system logs """ -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.comm.CommSyslogClient import CommSyslogClientConsts +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.comm.CommSyslogClient import CommSyslogClientConsts SYSLOG_DN = 'sys/svc-ext/syslog' diff --git a/imcsdk/apis/v2/admin/user.py b/imcsdk/apis/v2/admin/user.py index 21e224b0..b2a2538f 100644 --- a/imcsdk/apis/v2/admin/user.py +++ b/imcsdk/apis/v2/admin/user.py @@ -17,8 +17,8 @@ """ import logging -from imcsdk.imcexception import ImcOperationError, ImcOperationErrorDetail -from imcsdk.imccoreutils import process_conf_mos_response +from imcsdk_ecoen66.imcexception import ImcOperationError, ImcOperationErrorDetail +from imcsdk_ecoen66.imccoreutils import process_conf_mos_response log = logging.getLogger('imc') MAX_USERS = 15 @@ -107,7 +107,7 @@ def password_expire_enable(handle, AaaUserPasswordExpiration object """ - from imcsdk.mometa.aaa.AaaUserPasswordExpiration import \ + from imcsdk_ecoen66.mometa.aaa.AaaUserPasswordExpiration import \ AaaUserPasswordExpiration mo = AaaUserPasswordExpiration(parent_mo_or_dn="sys/user-ext") @@ -141,7 +141,7 @@ def password_expire_exists(handle, **kwargs): (True, AaaUserPasswordExpiration) is policy exists, else (False, None) """ - from imcsdk.mometa.aaa.AaaUserPasswordExpiration import \ + from imcsdk_ecoen66.mometa.aaa.AaaUserPasswordExpiration import \ AaaUserPasswordExpiration mo = AaaUserPasswordExpiration(parent_mo_or_dn="sys/user-ext") @@ -169,7 +169,7 @@ def password_expire_disable(handle): AaaUserPasswordExpiration object """ - from imcsdk.mometa.aaa.AaaUserPasswordExpiration import \ + from imcsdk_ecoen66.mometa.aaa.AaaUserPasswordExpiration import \ AaaUserPasswordExpiration mo = AaaUserPasswordExpiration(parent_mo_or_dn="sys/user-ext") @@ -194,7 +194,7 @@ def password_properties_exists(handle, **kwargs): (True, AaaUserPasswordExpiration) is policy exists, else (False, None) """ - from imcsdk.mometa.aaa.AaaUserPasswordExpiration import \ + from imcsdk_ecoen66.mometa.aaa.AaaUserPasswordExpiration import \ AaaUserPasswordExpiration mo = AaaUserPasswordExpiration(parent_mo_or_dn="sys/user-ext") @@ -232,7 +232,7 @@ def password_properties_set(handle, AaaUserPasswordExpiration object """ - from imcsdk.mometa.aaa.AaaUserPasswordExpiration import \ + from imcsdk_ecoen66.mometa.aaa.AaaUserPasswordExpiration import \ AaaUserPasswordExpiration mo = AaaUserPasswordExpiration(parent_mo_or_dn="sys/user-ext") @@ -290,7 +290,7 @@ def _get_local_user(handle, name): def _get_free_user_id(handle): - from imcsdk.mometa.aaa.AaaUser import AaaUserConsts + from imcsdk_ecoen66.mometa.aaa.AaaUser import AaaUserConsts users = _get_local_users(handle) for user in users: if user.account_status == AaaUserConsts.ACCOUNT_STATUS_INACTIVE and \ @@ -320,7 +320,7 @@ def local_user_create(handle, name, pwd, priv="read-only", Exception when limit on the number of users has exceeded """ - from imcsdk.mometa.aaa.AaaUser import AaaUser + from imcsdk_ecoen66.mometa.aaa.AaaUser import AaaUser # (1) local_user_exists(handle, name, pwd, priv) would be used by Ansible. # (2) local_user_exists(handle, name) would be used by user scripts. @@ -363,7 +363,7 @@ def _delete_users(handle, users=None, endpoint_users=None): ImcOperationError if the user is not found """ - from imcsdk.mometa.aaa.AaaUser import AaaUserConsts + from imcsdk_ecoen66.mometa.aaa.AaaUser import AaaUserConsts api = "Update Local Users" user_mos = [] @@ -426,8 +426,8 @@ def local_users_update(handle, users=None): Note: This error msg format is being used in Cisco Intersight to map error messages to respective users. Please excercise caution before changing it in the API. """ - from imcsdk.mometa.aaa.AaaUser import AaaUser - from imcsdk.imccoreutils import sanitize_message + from imcsdk_ecoen66.mometa.aaa.AaaUser import AaaUser + from imcsdk_ecoen66.imccoreutils import sanitize_message api = "Update Local Users" if users is None: users = [] @@ -590,7 +590,7 @@ def local_user_delete(handle, name): ImcOperationError if the user is not found """ - from imcsdk.mometa.aaa.AaaUser import AaaUserConsts + from imcsdk_ecoen66.mometa.aaa.AaaUser import AaaUserConsts found_user = _get_local_user(handle, name=name) if found_user is None: @@ -616,7 +616,7 @@ def local_user_delete_all(handle): ImcOperationError if the user is not found """ - from imcsdk.mometa.aaa.AaaUser import AaaUserConsts + from imcsdk_ecoen66.mometa.aaa.AaaUser import AaaUserConsts users = _get_local_users(handle) for user in users: @@ -655,7 +655,7 @@ def user_validate_inputs(**kwargs): """ This method will check if the input parameters are valid """ - from imcsdk.mometa.aaa.AaaUser import AaaUser + from imcsdk_ecoen66.mometa.aaa.AaaUser import AaaUser np = {} for prop in AaaUser.naming_props: if prop in kwargs: diff --git a/imcsdk/apis/v2/server/adaptor.py b/imcsdk/apis/v2/server/adaptor.py index 531ad8fd..d36b10c5 100644 --- a/imcsdk/apis/v2/server/adaptor.py +++ b/imcsdk/apis/v2/server/adaptor.py @@ -17,8 +17,8 @@ and create vnics and vhbas """ -from imcsdk.imccoreutils import get_server_dn -from imcsdk.apis.v2.utils import _get_mo +from imcsdk_ecoen66.imccoreutils import get_server_dn +from imcsdk_ecoen66.apis.v2.utils import _get_mo def _get_adaptor_dn(handle, adaptor_slot, server_id=1): @@ -105,7 +105,7 @@ def adaptor_properties_set(handle, adaptor_slot, lldp=None, fip_mode=None, AdaptorGenProfile object """ - from imcsdk.mometa.adaptor.AdaptorGenProfile import AdaptorGenProfile + from imcsdk_ecoen66.mometa.adaptor.AdaptorGenProfile import AdaptorGenProfile adaptor = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) mo = AdaptorGenProfile(parent_mo_or_dn=adaptor.dn) # VMFEX feature support is discontinued since 3.0(1c) release @@ -136,7 +136,7 @@ def adaptor_reset(handle, adaptor_slot, server_id=1, **kwargs): AdaptorUnit object """ - from imcsdk.mometa.adaptor.AdaptorUnit import AdaptorUnitConsts + from imcsdk_ecoen66.mometa.adaptor.AdaptorUnit import AdaptorUnitConsts mo = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) mo.admin_state = AdaptorUnitConsts.ADMIN_STATE_ADAPTOR_RESET handle.set_mo(mo) @@ -157,7 +157,7 @@ def vnic_get(handle, adaptor_slot, name, server_id=1, **kwargs): AdaptorHostEthIf object """ - from imcsdk.mometa.adaptor.AdaptorHostEthIf import AdaptorHostEthIf + from imcsdk_ecoen66.mometa.adaptor.AdaptorHostEthIf import AdaptorHostEthIf mo = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) vnic_mo = AdaptorHostEthIf(parent_mo_or_dn=mo.dn, name=name) @@ -207,7 +207,7 @@ def vnic_create(handle, AdaptorHostEthIf object """ - from imcsdk.mometa.adaptor.AdaptorHostEthIf import AdaptorHostEthIf + from imcsdk_ecoen66.mometa.adaptor.AdaptorHostEthIf import AdaptorHostEthIf mo = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) vnic = AdaptorHostEthIf(parent_mo_or_dn=mo.dn, name=name) @@ -261,7 +261,7 @@ def vhba_get(handle, adaptor_slot, name, server_id=1, **kwargs): AdaptorHostEthIf object """ - from imcsdk.mometa.adaptor.AdaptorHostFcIf import AdaptorHostFcIf + from imcsdk_ecoen66.mometa.adaptor.AdaptorHostFcIf import AdaptorHostFcIf mo = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) vhba_mo = AdaptorHostFcIf(parent_mo_or_dn=mo.dn, name=name) @@ -300,7 +300,7 @@ def vhba_create(handle, adaptor_slot, name, channel_number, wwnn, wwpn, san_boot=True, uplink_port=0, server_id=2) """ - from imcsdk.mometa.adaptor.AdaptorHostFcIf import AdaptorHostFcIf + from imcsdk_ecoen66.mometa.adaptor.AdaptorHostFcIf import AdaptorHostFcIf mo = adaptor_unit_get(handle, adaptor_slot, server_id, **kwargs) vhba_mo = AdaptorHostFcIf(parent_mo_or_dn=mo.dn, name=name) diff --git a/imcsdk/apis/v2/server/bios.py b/imcsdk/apis/v2/server/bios.py index f22efc21..6c355025 100644 --- a/imcsdk/apis/v2/server/bios.py +++ b/imcsdk/apis/v2/server/bios.py @@ -18,10 +18,10 @@ import logging import json -import imcsdk.imccoreutils as imccoreutils -from imcsdk.imccoreutils import is_platform_m4, is_platform_m5 -from imcsdk.imcexception import ImcOperationError, ImcException -from imcsdk.apis.v2.utils import _is_valid_arg +import imcsdk_ecoen66.imccoreutils as imccoreutils +from imcsdk_ecoen66.imccoreutils import is_platform_m4, is_platform_m5 +from imcsdk_ecoen66.imcexception import ImcOperationError, ImcException +from imcsdk_ecoen66.apis.v2.utils import _is_valid_arg log = logging.getLogger('imc') @@ -71,8 +71,8 @@ def bios_profile_backup_running(handle, server_id=1, **kwargs): bios_profile_backup_running(handle, server_id=1) """ - from imcsdk.mometa.bios.BiosProfileManagement import BiosProfileManagement - from imcsdk.mometa.bios.BiosProfileManagement import \ + from imcsdk_ecoen66.mometa.bios.BiosProfileManagement import BiosProfileManagement + from imcsdk_ecoen66.mometa.bios.BiosProfileManagement import \ BiosProfileManagementConsts mo = BiosProfileManagement(parent_mo_or_dn=_get_bios_dn(handle, server_id)) @@ -109,7 +109,7 @@ def bios_profile_upload(handle, remote_server, remote_file, protocol='tftp', user='abcd', pwd='pqrs') """ - from imcsdk.mometa.upload.UploadBiosProfile import UploadBiosProfile + from imcsdk_ecoen66.mometa.upload.UploadBiosProfile import UploadBiosProfile bios_dn = _get_bios_dn(handle, server_id=server_id) mo = UploadBiosProfile( parent_mo_or_dn=bios_dn + '/profile-mgmt') @@ -180,7 +180,7 @@ def bios_profile_activate(handle, name, backup_on_activate=True, reboot_on_activate=False) """ - from imcsdk.mometa.bios.BiosProfile import BiosProfileConsts + from imcsdk_ecoen66.mometa.bios.BiosProfile import BiosProfileConsts mo = _get_bios_profile(handle, name=name, server_id=server_id) params = { 'backup_on_activate': ('no', 'yes')[backup_on_activate], @@ -214,7 +214,7 @@ def bios_profile_delete(handle, name, server_id=1): Examples: bios_profile_delete(handle, name='simple', server_id=2) """ - from imcsdk.mometa.bios.BiosProfile import BiosProfileConsts + from imcsdk_ecoen66.mometa.bios.BiosProfile import BiosProfileConsts mo = _get_bios_profile(handle, name=name, server_id=server_id) mo.admin_action = BiosProfileConsts.ADMIN_ACTION_DELETE handle.set_mo(mo) @@ -347,9 +347,9 @@ def bios_tokens_set(handle, tokens={}, server_id=1): server_id=2) """ - from imcsdk.imccoreutils import load_class, sanitize_xml_parsing_error - from imcsdk.mometa.bios.BiosSettings import BiosSettings - from imcsdk.imccoremeta import ImcVersion + from imcsdk_ecoen66.imccoreutils import load_class, sanitize_xml_parsing_error + from imcsdk_ecoen66.mometa.bios.BiosSettings import BiosSettings + from imcsdk_ecoen66.imccoremeta import ImcVersion messages = [] ret = {} @@ -500,7 +500,7 @@ def bios_tokens_exist(handle, tokens={}, server_id=1): server_id=2) """ - from imcsdk.imcexception import ImcException + from imcsdk_ecoen66.imcexception import ImcException parent_dn = _get_bios_dn(handle, server_id) + "/bios-settings" mo_table = _get_bios_mo_table(handle, tokens, server_id) @@ -535,7 +535,7 @@ def bios_tokens_exist(handle, tokens={}, server_id=1): def _get_bios_mo_table(handle, tokens={}, server_id=1): - from imcsdk.imcbiostables import bios_tokens_table + from imcsdk_ecoen66.imcbiostables import bios_tokens_table mo_table = {} diff --git a/imcsdk/apis/v2/server/boot.py b/imcsdk/apis/v2/server/boot.py index bbf325ec..1453bac5 100644 --- a/imcsdk/apis/v2/server/boot.py +++ b/imcsdk/apis/v2/server/boot.py @@ -19,11 +19,11 @@ import logging import re -import imcsdk.imccoreutils as imccoreutils -from imcsdk.imcexception import ImcOperationError, ImcOperationErrorDetail -from imcsdk.mometa.lsboot.LsbootDevPrecision import LsbootDevPrecision +import imcsdk_ecoen66.imccoreutils as imccoreutils +from imcsdk_ecoen66.imcexception import ImcOperationError, ImcOperationErrorDetail +from imcsdk_ecoen66.mometa.lsboot.LsbootDevPrecision import LsbootDevPrecision -import imcsdk.apis.v2.server.pxe as pxe +import imcsdk_ecoen66.apis.v2.server.pxe as pxe log = logging.getLogger('imc') @@ -151,7 +151,7 @@ def _get_device_type(policy_type, in_device): def _get_device(parent_mo_or_dn, device_type, device_name): - from imcsdk.imccoreutils import load_class + from imcsdk_ecoen66.imccoreutils import load_class # precision boot order supports hierarchy in configConfMO # legacy boot order does not @@ -209,7 +209,7 @@ def _add_boot_device(handle, parent_mo_or_dn, boot_device): None """ - from imcsdk.imccoreutils import is_platform_m4 + from imcsdk_ecoen66.imccoreutils import is_platform_m4 log.debug("######### %s" % boot_device) device = _get_device(parent_mo_or_dn, @@ -296,9 +296,9 @@ def boot_order_precision_set( "name":"vmedia"}, {"order":'2', "device-type":"hdd", "name":"hdd"}] """ - from imcsdk.mometa.lsboot.LsbootDef import LsbootDef - from imcsdk.mometa.lsboot.LsbootBootSecurity import LsbootBootSecurity - from imcsdk.imccoreutils import is_platform_m4 + from imcsdk_ecoen66.mometa.lsboot.LsbootDef import LsbootDef + from imcsdk_ecoen66.mometa.lsboot.LsbootBootSecurity import LsbootBootSecurity + from imcsdk_ecoen66.imccoreutils import is_platform_m4 boot_devices = sanitize_input_from_intersight(handle, boot_devices) @@ -368,7 +368,7 @@ def boot_order_precision_set( def boot_precision_configured_get(handle, server_id=1): - from imcsdk.imccoreutils import get_server_dn + from imcsdk_ecoen66.imccoreutils import get_server_dn configured_boot_order = [] @@ -391,8 +391,8 @@ def boot_precision_configured_get(handle, server_id=1): def boot_order_precision_exists(handle, **kwargs): - from imcsdk.imccoreutils import _set_server_dn - from imcsdk.apis.v2.utils import _is_valid_arg + from imcsdk_ecoen66.imccoreutils import _set_server_dn + from imcsdk_ecoen66.apis.v2.utils import _is_valid_arg server_dn = _set_server_dn(handle, kwargs) mos = handle.query_children(in_dn=server_dn, @@ -448,7 +448,7 @@ def boot_order_policy_get(handle, dump=False, server_id=1): boot_order_policy_get(handle, dump=False) """ - from imcsdk.mometa.lsboot.LsbootBootSecurity import LsbootBootSecurity + from imcsdk_ecoen66.mometa.lsboot.LsbootBootSecurity import LsbootBootSecurity server_dn = imccoreutils.get_server_dn(handle, server_id) parent_dn = server_dn + "/boot-policy" @@ -529,8 +529,8 @@ def boot_order_policy_set(handle, reboot_on_update="no", # IMC expects the devices to be configured in sorted order boot_devices = sorted(boot_devices, key=lambda x: int(x["order"])) - from imcsdk.mometa.lsboot.LsbootDef import LsbootDef - from imcsdk.mometa.lsboot.LsbootBootSecurity import LsbootBootSecurity + from imcsdk_ecoen66.mometa.lsboot.LsbootDef import LsbootDef + from imcsdk_ecoen66.mometa.lsboot.LsbootBootSecurity import LsbootBootSecurity server_dn = imccoreutils.get_server_dn(handle, server_id) @@ -586,7 +586,7 @@ def sanitize_input_from_intersight(handle, boot_devices): We also convert from intersight device type to sdk device type """ import copy - from imcsdk.apis.v2.versionconstraints.boot import fix_bootloader_options + from imcsdk_ecoen66.apis.v2.versionconstraints.boot import fix_bootloader_options log.debug("##### Input boot devices %s" % boot_devices) # if order is present, then it is not an input from intersight if len(boot_devices) > 0 and "order" in boot_devices[0]: diff --git a/imcsdk/apis/v2/server/health.py b/imcsdk/apis/v2/server/health.py index 90fa818f..8bc31688 100644 --- a/imcsdk/apis/v2/server/health.py +++ b/imcsdk/apis/v2/server/health.py @@ -35,7 +35,7 @@ def faults_get(handle, parent_class_id=None, dump=False): faults_get(handle, dump=True) """ - from imcsdk.imccoreutils import write_object + from imcsdk_ecoen66.imccoreutils import write_object if parent_class_id: fault_list = [] diff --git a/imcsdk/apis/v2/server/inventory.py b/imcsdk/apis/v2/server/inventory.py index d18081d9..967cee81 100644 --- a/imcsdk/apis/v2/server/inventory.py +++ b/imcsdk/apis/v2/server/inventory.py @@ -16,7 +16,7 @@ """ import json -from imcsdk.imcexception import ImcOperationError +from imcsdk_ecoen66.imcexception import ImcOperationError inventory_spec = { "cpu": { diff --git a/imcsdk/apis/v2/server/kmip.py b/imcsdk/apis/v2/server/kmip.py index 71fb78e5..86af694c 100644 --- a/imcsdk/apis/v2/server/kmip.py +++ b/imcsdk/apis/v2/server/kmip.py @@ -16,8 +16,8 @@ This module implements all the kmip related config """ -from imcsdk.imcexception import ImcOperationError -from imcsdk.imccoreutils import IMC_PLATFORM +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.imccoreutils import IMC_PLATFORM def _get_server_dn(handle, server_id="1"): @@ -137,7 +137,7 @@ def _get_free_kmip_server_id(handle, server_id=1): def kmip_server_add(handle, ip_address, port=None, timeout=None, server_id=1): - from imcsdk.mometa.kmip.KmipServer import KmipServer + from imcsdk_ecoen66.mometa.kmip.KmipServer import KmipServer args = { "ip_address": ip_address, @@ -165,7 +165,7 @@ def kmip_server_exists(handle, ip_address, server_id=1, **kwargs): def kmip_server_remove(handle, ip_address, server_id=1): - from imcsdk.mometa.kmip.KmipServer import KmipServerConsts + from imcsdk_ecoen66.mometa.kmip.KmipServer import KmipServerConsts mo = _get_kmip_server(handle, ip_address, server_id) if mo is None: diff --git a/imcsdk/apis/v2/server/kvm.py b/imcsdk/apis/v2/server/kvm.py index 03564780..08e4cbd5 100644 --- a/imcsdk/apis/v2/server/kvm.py +++ b/imcsdk/apis/v2/server/kvm.py @@ -17,8 +17,8 @@ import re -from imcsdk.mometa.comm.CommKvm import CommKvm -from imcsdk.apis.v2.admin.ipmi import _get_comm_mo_dn +from imcsdk_ecoen66.mometa.comm.CommKvm import CommKvm +from imcsdk_ecoen66.apis.v2.admin.ipmi import _get_comm_mo_dn CIFS_URI_PATTERN = re.compile('^//\d+\.\d+\.\d+\.\d+\/') NFS_URI_PATTERN = re.compile('^\d+\.\d+\.\d+\.\d+\:\/') diff --git a/imcsdk/apis/v2/server/power.py b/imcsdk/apis/v2/server/power.py index 6c73c8a5..b9fce076 100644 --- a/imcsdk/apis/v2/server/power.py +++ b/imcsdk/apis/v2/server/power.py @@ -15,10 +15,10 @@ This module implements apis for power policy and power cap related config """ -from imcsdk.imccoreutils import get_server_dn -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.power.PowerBudget import PowerBudget, PowerBudgetConsts -from imcsdk.mometa.standard.StandardPowerProfile import StandardPowerProfile +from imcsdk_ecoen66.imccoreutils import get_server_dn +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.power.PowerBudget import PowerBudget, PowerBudgetConsts +from imcsdk_ecoen66.mometa.standard.StandardPowerProfile import StandardPowerProfile import logging log = logging.getLogger('imc') diff --git a/imcsdk/apis/v2/server/pxe.py b/imcsdk/apis/v2/server/pxe.py index 6b05fee2..1d8ec248 100644 --- a/imcsdk/apis/v2/server/pxe.py +++ b/imcsdk/apis/v2/server/pxe.py @@ -19,10 +19,10 @@ import logging import re -import imcsdk.imccoreutils as imccoreutils -import imcsdk.imcgenutils as imcgenutils -from imcsdk.imcexception import ImcOperationError, ImcOperationErrorDetail -from imcsdk.mometa.lsboot.LsbootDevPrecision import LsbootDevPrecision +import imcsdk_ecoen66.imccoreutils as imccoreutils +import imcsdk_ecoen66.imcgenutils as imcgenutils +from imcsdk_ecoen66.imcexception import ImcOperationError, ImcOperationErrorDetail +from imcsdk_ecoen66.mometa.lsboot.LsbootDevPrecision import LsbootDevPrecision log = logging.getLogger('imc') @@ -48,7 +48,7 @@ def _filter_pxe_device(boot_devices): def _remove_pxe_with_mac_for_m4(handle, pxe_devices): - from imcsdk.imccoreutils import is_platform_m4 + from imcsdk_ecoen66.imccoreutils import is_platform_m4 if not is_platform_m4(handle): return pxe_devices @@ -151,8 +151,8 @@ def _parse_pxe_devices(devices): if port is None: slot_port_name = slot else: - slot_port_name = slot + PXE_DELIMITER + str(port) - + slot_port_name = slot + PXE_DELIMITER + str(port) + if slot_port_name in slot_port_map: continue slot_port_map[slot_port_name] = device @@ -247,7 +247,7 @@ def _enable_pxe_boot_mac(handle, mac_address_map, ep_mac_map): if not match: raise ImcOperationError(PXE_API_ERROR, "Invalid Interface.") - + slotEp = match.groupdict()['slot'] if slotEp in ep_slot_map: continue @@ -257,7 +257,7 @@ def _enable_pxe_boot_mac(handle, mac_address_map, ep_mac_map): # if slot is given in the pxe device check whether it is present on the end point # if slot is present on the end point check whether mac is present on the endpoint if present enable pxe on the respective vnic # if slot is present on the end point check whether mac is present on the endpoint if not present return an error - # + # # if slot is not present on the end point consider it as non-vic adapter and enable pxe missing_mac_str = "" for mac in mac_address_map: @@ -280,7 +280,7 @@ def _enable_pxe_boot_mac(handle, mac_address_map, ep_mac_map): missing_mac_str += err_str if missing_mac_str: continue - + vnic = ep_mac_map[mac] vnic.pxe_boot = "enabled" vnics_to_configure.append(vnic) diff --git a/imcsdk/apis/v2/server/serveractions.py b/imcsdk/apis/v2/server/serveractions.py index 9f96ccf8..1b357007 100644 --- a/imcsdk/apis/v2/server/serveractions.py +++ b/imcsdk/apis/v2/server/serveractions.py @@ -17,17 +17,17 @@ """ import time -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.compute.ComputeRackUnit import ComputeRackUnit,\ +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.compute.ComputeRackUnit import ComputeRackUnit,\ ComputeRackUnitConsts -from imcsdk.mometa.equipment.EquipmentChassis import EquipmentChassis -from imcsdk.mometa.compute.ComputeServerNode import ComputeServerNodeConsts -from imcsdk.mometa.equipment.EquipmentLocatorLed \ +from imcsdk_ecoen66.mometa.equipment.EquipmentChassis import EquipmentChassis +from imcsdk_ecoen66.mometa.compute.ComputeServerNode import ComputeServerNodeConsts +from imcsdk_ecoen66.mometa.equipment.EquipmentLocatorLed \ import EquipmentLocatorLed, EquipmentLocatorLedConsts -from imcsdk.mometa.equipment.EquipmentChassisLocatorLed \ +from imcsdk_ecoen66.mometa.equipment.EquipmentChassisLocatorLed \ import EquipmentChassisLocatorLed, EquipmentChassisLocatorLedConsts -from imcsdk.imccoreutils import get_server_dn, IMC_PLATFORM, _set_server_dn -from imcsdk.apis.v2.utils import _is_valid_arg +from imcsdk_ecoen66.imccoreutils import get_server_dn, IMC_PLATFORM, _set_server_dn +from imcsdk_ecoen66.apis.v2.utils import _is_valid_arg def _set_power_state(handle, server_dn, state): diff --git a/imcsdk/apis/v2/server/sol.py b/imcsdk/apis/v2/server/sol.py index 3c09c716..9a78ce12 100644 --- a/imcsdk/apis/v2/server/sol.py +++ b/imcsdk/apis/v2/server/sol.py @@ -16,9 +16,9 @@ This module implements all the sol related config """ -from imcsdk.imcexception import ImcOperationError -from imcsdk.imccoreutils import get_server_dn -from imcsdk.mometa.sol.SolIf import SolIf, SolIfConsts +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.imccoreutils import get_server_dn +from imcsdk_ecoen66.mometa.sol.SolIf import SolIf, SolIfConsts def sol_get(handle, server_id=1, caller="sol_get"): diff --git a/imcsdk/apis/v2/server/storage.py b/imcsdk/apis/v2/server/storage.py index d37ce350..53c067ed 100644 --- a/imcsdk/apis/v2/server/storage.py +++ b/imcsdk/apis/v2/server/storage.py @@ -19,14 +19,14 @@ import math import logging -import imcsdk.imccoreutils as imccoreutils -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.storage.StorageVirtualDriveCreatorUsingUnusedPhysicalDrive \ +import imcsdk_ecoen66.imccoreutils as imccoreutils +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.storage.StorageVirtualDriveCreatorUsingUnusedPhysicalDrive \ import StorageVirtualDriveCreatorUsingUnusedPhysicalDrive as vd_creator -from imcsdk.mometa.self.SelfEncryptStorageController import \ +from imcsdk_ecoen66.mometa.self.SelfEncryptStorageController import \ SelfEncryptStorageController, SelfEncryptStorageControllerConsts -from imcsdk.mometa.storage.StorageLocalDisk import StorageLocalDiskConsts -from imcsdk.mometa.storage.StorageController import StorageControllerConsts +from imcsdk_ecoen66.mometa.storage.StorageLocalDisk import StorageLocalDiskConsts +from imcsdk_ecoen66.mometa.storage.StorageController import StorageControllerConsts log = logging.getLogger('imc') @@ -364,7 +364,7 @@ def virtual_drive_encryption_enable(handle, controller_type, Examples: virtual_drive_encryption_enable(handle, 'SAS', 'HBA', 'test_vd') """ - from imcsdk.mometa.storage.StorageVirtualDrive import \ + from imcsdk_ecoen66.mometa.storage.StorageVirtualDrive import \ StorageVirtualDriveConsts vd = vd_query_by_name(handle=handle, controller_type=controller_type, @@ -395,7 +395,7 @@ def virtual_drive_set_boot_drive(handle, controller_type, controller_slot, name, Examples: virtual_drive_set_boot_drive(handle, 'SAS', 'HBA', 'test_vd') """ - from imcsdk.mometa.storage.StorageVirtualDrive import \ + from imcsdk_ecoen66.mometa.storage.StorageVirtualDrive import \ StorageVirtualDriveConsts vd = vd_query_by_name(handle=handle, controller_type=controller_type, @@ -523,7 +523,7 @@ def controller_encryption_enable(handle, controller_type, controller_slot='HBA'', key_id='ABCD12345', security_key='12345') """ - from imcsdk.mometa.self.SelfEncryptStorageController import \ + from imcsdk_ecoen66.mometa.self.SelfEncryptStorageController import \ SelfEncryptStorageController, SelfEncryptStorageControllerConsts enabled, mo = controller_encryption_exists(handle, diff --git a/imcsdk/apis/v2/server/vic.py b/imcsdk/apis/v2/server/vic.py index 48487df0..0685bdf5 100644 --- a/imcsdk/apis/v2/server/vic.py +++ b/imcsdk/apis/v2/server/vic.py @@ -20,15 +20,15 @@ import logging import time -from imcsdk.imccoreutils import get_server_dn -from imcsdk.apis.v2.utils import _get_mo -from imcsdk.imcexception import ImcOperationError, ImcOperationErrorDetail -from imcsdk.imccoreutils import process_conf_mos_response, sanitize_message -from imcsdk.mometa.adaptor.AdaptorUnit import AdaptorUnitConsts -from imcsdk.mometa.adaptor.AdaptorExtEthIf import AdaptorExtEthIfConsts -from imcsdk.apis.v2.server.serveractions import _wait_for_power_state, \ +from imcsdk_ecoen66.imccoreutils import get_server_dn +from imcsdk_ecoen66.apis.v2.utils import _get_mo +from imcsdk_ecoen66.imcexception import ImcOperationError, ImcOperationErrorDetail +from imcsdk_ecoen66.imccoreutils import process_conf_mos_response, sanitize_message +from imcsdk_ecoen66.mometa.adaptor.AdaptorUnit import AdaptorUnitConsts +from imcsdk_ecoen66.mometa.adaptor.AdaptorExtEthIf import AdaptorExtEthIfConsts +from imcsdk_ecoen66.apis.v2.server.serveractions import _wait_for_power_state, \ server_power_cycle, server_power_state_get -from imcsdk.apis.v2.server.adaptor import adaptor_properties_get +from imcsdk_ecoen66.apis.v2.server.adaptor import adaptor_properties_get log = logging.getLogger('imc') @@ -95,7 +95,7 @@ def adaptor_unit_get(handle, adaptor_slot, server_id=1, **kwargs): return _get_mo(handle, dn=_get_adaptor_dn(handle, adaptor_slot, server_id)) def adaptor_get_all(handle): - from imcsdk.imcconstants import NamingId + from imcsdk_ecoen66.imcconstants import NamingId return handle.query_classid(class_id=NamingId.ADAPTOR_UNIT) @@ -113,7 +113,7 @@ def adaptor_set_all(handle, adaptors=None, server_id=1, **kwargs): ] ) """ - from imcsdk.mometa.adaptor.AdaptorGenProfile import AdaptorGenProfile + from imcsdk_ecoen66.mometa.adaptor.AdaptorGenProfile import AdaptorGenProfile api = 'adaptor_set_all' api_error_msg = VicConst.ADAPTOR_ERROR_MSG @@ -252,7 +252,7 @@ def _ext_ethif_set_all(handle, ext_ethifs, adaptor_mo): fec_mode: "Off"}], adaptor_mo=) """ - from imcsdk.mometa.adaptor.AdaptorExtEthIf import AdaptorExtEthIf + from imcsdk_ecoen66.mometa.adaptor.AdaptorExtEthIf import AdaptorExtEthIf # configure ext_ethifs on adaptor mos = [] @@ -288,7 +288,7 @@ def _process_mo_prop_str(prop_str, api_error_msg): separates mo and prop name Return mo - AdaptorFcGenProfile, prop - PciLink ''' - from imcsdk.imcgenutils import to_python_propname + from imcsdk_ecoen66.imcgenutils import to_python_propname props = prop_str.split(".") if len(props) != 2: raise ImcOperationError( @@ -304,8 +304,8 @@ def _create_child_mo(parent_mo_or_dn, mo_name): ''' creates child object of vnic and vhba ''' - from imcsdk.imccoreutils import load_class - from imcsdk.imccoreutils import find_class_id_in_mo_meta_ignore_case + from imcsdk_ecoen66.imccoreutils import load_class + from imcsdk_ecoen66.imccoreutils import find_class_id_in_mo_meta_ignore_case class_id = find_class_id_in_mo_meta_ignore_case(mo_name) if class_id is None: @@ -321,7 +321,7 @@ def _vic_get(handle, adaptor_slot, name, vic_type, server_id=1): """ Internal method to get vnic and vhba """ - from imcsdk.imccoreutils import load_class + from imcsdk_ecoen66.imccoreutils import load_class parent_mo = adaptor_unit_get(handle, adaptor_slot, server_id) if parent_mo is None: @@ -424,8 +424,8 @@ def _validate_vics(vic_type, api_error_msg, vics, adaptor_ep_dict): def _create_vic_object(adaptor_mo, vic_name, vic_type, api_error_msg, **kwargs): - from imcsdk.imccoreutils import load_class - from imcsdk.imccoreutils import find_class_id_in_mo_meta_ignore_case + from imcsdk_ecoen66.imccoreutils import load_class + from imcsdk_ecoen66.imccoreutils import find_class_id_in_mo_meta_ignore_case vic_mo_name = vic_map[vic_type] vic_mo_class = load_class(vic_mo_name) diff --git a/imcsdk/apis/v2/server/vmedia.py b/imcsdk/apis/v2/server/vmedia.py index 397bba21..3d0d6476 100644 --- a/imcsdk/apis/v2/server/vmedia.py +++ b/imcsdk/apis/v2/server/vmedia.py @@ -21,12 +21,12 @@ import re import logging -from imcsdk.mometa.comm.CommVMedia import CommVMedia -from imcsdk.mometa.comm.CommVMediaMap import CommVMediaMap -from imcsdk.apis.v2.admin.ipmi import _get_comm_mo_dn -from imcsdk.mometa.comm.CommVMediaMap import CommVMediaMapConsts -from imcsdk.imccoreutils import process_conf_mos_response, sanitize_message -from imcsdk.imcexception import ImcOperationError, ImcOperationErrorDetail +from imcsdk_ecoen66.mometa.comm.CommVMedia import CommVMedia +from imcsdk_ecoen66.mometa.comm.CommVMediaMap import CommVMediaMap +from imcsdk_ecoen66.apis.v2.admin.ipmi import _get_comm_mo_dn +from imcsdk_ecoen66.mometa.comm.CommVMediaMap import CommVMediaMapConsts +from imcsdk_ecoen66.imccoreutils import process_conf_mos_response, sanitize_message +from imcsdk_ecoen66.imcexception import ImcOperationError, ImcOperationErrorDetail log = logging.getLogger('imc') @@ -554,7 +554,7 @@ def vmedia_mount_remove_all(handle, volumes= None, server_id=1): Examples: vmedia_mount_remove_all(handle,[a,b]) """ - from imcsdk.mometa.comm.CommSavedVMediaMap import CommSavedVMediaMapConsts + from imcsdk_ecoen66.mometa.comm.CommSavedVMediaMap import CommSavedVMediaMapConsts # Get all current virtually mapped and saved mappings virt_media_maps = handle.query_children(in_dn=_get_vmedia_mo_dn(handle, diff --git a/imcsdk/apis/v2/storage/controller.py b/imcsdk/apis/v2/storage/controller.py index c347388a..ffd3fb7f 100644 --- a/imcsdk/apis/v2/storage/controller.py +++ b/imcsdk/apis/v2/storage/controller.py @@ -18,11 +18,11 @@ import logging -import imcsdk.imccoreutils as imccoreutils -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.self.SelfEncryptStorageController import \ +import imcsdk_ecoen66.imccoreutils as imccoreutils +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.self.SelfEncryptStorageController import \ SelfEncryptStorageController, SelfEncryptStorageControllerConsts -from imcsdk.mometa.storage.StorageController import StorageControllerConsts +from imcsdk_ecoen66.mometa.storage.StorageController import StorageControllerConsts log = logging.getLogger('imc') @@ -171,7 +171,7 @@ def controller_encryption_enable(handle, controller_type, controller_slot, controller_slot='HBA'', key_id='ABCD12345', security_key='12345') """ - from imcsdk.mometa.self.SelfEncryptStorageController import \ + from imcsdk_ecoen66.mometa.self.SelfEncryptStorageController import \ SelfEncryptStorageController, SelfEncryptStorageControllerConsts controller_mo = _get_controller(handle, controller_type, controller_slot, diff --git a/imcsdk/apis/v2/storage/pd.py b/imcsdk/apis/v2/storage/pd.py index fc5bfbfc..a7ec8f44 100644 --- a/imcsdk/apis/v2/storage/pd.py +++ b/imcsdk/apis/v2/storage/pd.py @@ -18,9 +18,9 @@ import logging -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.storage.StorageLocalDisk import StorageLocalDiskConsts -from imcsdk.apis.v2.storage.controller import _get_controller_dn +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.storage.StorageLocalDisk import StorageLocalDiskConsts +from imcsdk_ecoen66.apis.v2.storage.controller import _get_controller_dn log = logging.getLogger('imc') @@ -124,7 +124,7 @@ def pd_set_jbod(handle, pd_set_jbod(handle, controller_type='SAS', controller_slot='HBA', drive_slot=4) """ - from imcsdk.apis.v2.storage.controller import controller_jbod_exists + from imcsdk_ecoen66.apis.v2.storage.controller import controller_jbod_exists if not controller_jbod_exists(handle, controller_type, diff --git a/imcsdk/apis/v2/storage/sdcard.py b/imcsdk/apis/v2/storage/sdcard.py index ca08e484..4cf1ede1 100644 --- a/imcsdk/apis/v2/storage/sdcard.py +++ b/imcsdk/apis/v2/storage/sdcard.py @@ -17,9 +17,9 @@ """ import logging -from imcsdk.imcexception import ImcOperationError, ImcOperationErrorDetail -from imcsdk.imcconstants import NamingId -from imcsdk.imccoreutils import process_conf_mos_response, sanitize_message +from imcsdk_ecoen66.imcexception import ImcOperationError, ImcOperationErrorDetail +from imcsdk_ecoen66.imcconstants import NamingId +from imcsdk_ecoen66.imccoreutils import process_conf_mos_response, sanitize_message log = logging.getLogger('imc') @@ -142,7 +142,7 @@ def flexflash_controller_set(handle, admin_action=None, auto_sync=None, def flexflash_controller_mode_mirror_set(handle, card_slot, partition_name="Hypervisor", auto_sync=None): - from imcsdk.mometa.storage.StorageFlexFlashController import \ + from imcsdk_ecoen66.mometa.storage.StorageFlexFlashController import \ StorageFlexFlashControllerConsts as const return flexflash_controller_set( @@ -160,7 +160,7 @@ def flexflash_controller_mode_util_set( card_slot, partition_name="Hypervisor", non_util_partition_name="UserPartition"): - from imcsdk.mometa.storage.StorageFlexFlashController import \ + from imcsdk_ecoen66.mometa.storage.StorageFlexFlashController import \ StorageFlexFlashControllerConsts as const return flexflash_controller_set( @@ -267,7 +267,7 @@ def _get_available_slots(pds): def _set_admin_action_flash_vd(handle, partition_id, admin_action, controller_dn): - from imcsdk.mometa.storage.StorageFlexFlashVirtualDrive import \ + from imcsdk_ecoen66.mometa.storage.StorageFlexFlashVirtualDrive import \ StorageFlexFlashVirtualDrive mo = StorageFlexFlashVirtualDrive(parent_mo_or_dn=controller_dn, @@ -277,7 +277,7 @@ def _set_admin_action_flash_vd(handle, partition_id, admin_action, def _apply_config_card_action_mirror(handle, mos_dict, vd): - from imcsdk.mometa.storage.StorageFlexFlashVirtualDrive import \ + from imcsdk_ecoen66.mometa.storage.StorageFlexFlashVirtualDrive import \ StorageFlexFlashVirtualDriveConsts # slot = _choose_slot(mos_dict['flexflash_pds']) @@ -323,7 +323,7 @@ def _apply_config_card_action_mirror(handle, mos_dict, vd): def _apply_config_card_action_util(handle, mos_dict, vds): - from imcsdk.mometa.storage.StorageFlexFlashVirtualDrive import \ + from imcsdk_ecoen66.mometa.storage.StorageFlexFlashVirtualDrive import \ StorageFlexFlashVirtualDriveConsts # slot = _choose_slot(mos_dict['flexflash_pds']) diff --git a/imcsdk/apis/v2/storage/vd.py b/imcsdk/apis/v2/storage/vd.py index ba64b452..e39ef4c7 100644 --- a/imcsdk/apis/v2/storage/vd.py +++ b/imcsdk/apis/v2/storage/vd.py @@ -20,12 +20,12 @@ import math import logging -from imcsdk.imcexception import ImcOperationError, ImcException, ImcOperationErrorDetail -from imcsdk.apis.v2.storage.controller import _get_controller_dn -from imcsdk.apis.v2.storage.pd import pd_get -from imcsdk.mometa.storage.StorageVirtualDriveCreatorUsingUnusedPhysicalDrive \ +from imcsdk_ecoen66.imcexception import ImcOperationError, ImcException, ImcOperationErrorDetail +from imcsdk_ecoen66.apis.v2.storage.controller import _get_controller_dn +from imcsdk_ecoen66.apis.v2.storage.pd import pd_get +from imcsdk_ecoen66.mometa.storage.StorageVirtualDriveCreatorUsingUnusedPhysicalDrive \ import StorageVirtualDriveCreatorUsingUnusedPhysicalDrive as vd_creator -from imcsdk.mometa.storage.StorageVirtualDriveCreatorUsingVirtualDriveGroup \ +from imcsdk_ecoen66.mometa.storage.StorageVirtualDriveCreatorUsingVirtualDriveGroup \ import StorageVirtualDriveCreatorUsingVirtualDriveGroup as vd_carve log = logging.getLogger('imc') @@ -468,7 +468,7 @@ def vd_delete(handle, controller_type, controller_slot, id, server_id=1, vd_delete(handle=imc, controller_type='SAS', controller_slot='MEZZ', id=1) """ - from imcsdk.apis.v2.storage.controller import controller_clear_boot_drive + from imcsdk_ecoen66.apis.v2.storage.controller import controller_clear_boot_drive mo = vd_get(handle=handle, controller_type=controller_type, @@ -499,7 +499,7 @@ def vd_delete_all(handle, controller_type, controller_slot, server_id=1, vd_delete_all(handle=imc, controller_type='SAS', controller_slot='MEZZ', id=1) """ - from imcsdk.apis.v2.storage.controller import controller_clear_boot_drive + from imcsdk_ecoen66.apis.v2.storage.controller import controller_clear_boot_drive controller_dn = _get_controller_dn(handle, controller_type, controller_slot, server_id) @@ -568,7 +568,7 @@ def vd_boot_drive_enable(handle, controller_type, controller_slot, id, Examples: vd_set_boot_drive(handle, 'SAS', 'HBA', 'test_vd') """ - from imcsdk.mometa.storage.StorageVirtualDrive import \ + from imcsdk_ecoen66.mometa.storage.StorageVirtualDrive import \ StorageVirtualDriveConsts action = StorageVirtualDriveConsts.ADMIN_ACTION_SET_BOOT_DRIVE @@ -636,7 +636,7 @@ def vd_boot_drive_disable(handle, controller_type, controller_slot, id, Examples: vd_set_boot_drive(handle, 'SAS', 'HBA', 'test_vd') """ - from imcsdk.apis.v2.storage.controller import controller_clear_boot_drive + from imcsdk_ecoen66.apis.v2.storage.controller import controller_clear_boot_drive vd = vd_get(handle, controller_type, controller_slot, id, server_id) if vd.boot_drive.lower() not in ('true', 'yes'): @@ -669,7 +669,7 @@ def vd_encryption_enable(handle, controller_type, controller_slot, id, Examples: vd_encryption_enable(handle, 'SAS', 'HBA', 1) """ - from imcsdk.mometa.storage.StorageVirtualDrive import \ + from imcsdk_ecoen66.mometa.storage.StorageVirtualDrive import \ StorageVirtualDriveConsts action = StorageVirtualDriveConsts.ADMIN_ACTION_ENABLE_SELF_ENCRYPT diff --git a/imcsdk/apis/v2/utils.py b/imcsdk/apis/v2/utils.py index e7fc29e9..e27067bf 100644 --- a/imcsdk/apis/v2/utils.py +++ b/imcsdk/apis/v2/utils.py @@ -13,7 +13,7 @@ import logging -from imcsdk.imcexception import ImcOperationError +from imcsdk_ecoen66.imcexception import ImcOperationError log = logging.getLogger('imc') diff --git a/imcsdk/apis/v2/versionconstraints/snmp.py b/imcsdk/apis/v2/versionconstraints/snmp.py index 55ac7fbf..32f31b92 100644 --- a/imcsdk/apis/v2/versionconstraints/snmp.py +++ b/imcsdk/apis/v2/versionconstraints/snmp.py @@ -72,8 +72,8 @@ def snmp_commit_explicitly_for_hp_and_above(handle, parent_dn): if we send multiple user or trap request earlier as no-commit. ''' - from imcsdk.mometa.comm.CommSnmpConfigCommit import CommSnmpConfigCommit - from imcsdk.mometa.comm.CommSnmpConfigCommit import \ + from imcsdk_ecoen66.mometa.comm.CommSnmpConfigCommit import CommSnmpConfigCommit + from imcsdk_ecoen66.mometa.comm.CommSnmpConfigCommit import \ CommSnmpConfigCommitConsts # if version is less than HP then return diff --git a/imcsdk/imccoreutils.py b/imcsdk/imccoreutils.py index 5738e803..f8be1f87 100644 --- a/imcsdk/imccoreutils.py +++ b/imcsdk/imccoreutils.py @@ -67,6 +67,7 @@ def get_imc_obj(class_id, elem, mo_obj=None): """ import inspect + import sys from . import imcmethod from . import imcmo @@ -76,7 +77,12 @@ def get_imc_obj(class_id, elem, mo_obj=None): return imcmethod.ExternalMethod(class_id) elif class_id in MO_CLASS_ID: mo_class = load_class(class_id) - mo_class_params = inspect.getargspec(mo_class.__init__)[0][2:] + if sys.version_info > (3, 0): + # Python 3 code in this block + mo_class_params = inspect.getfullargspec(mo_class.__init__)[0][2:] + else: + # Python 2 code in this block + mo_class_params = inspect.getargspec(mo_class.__init__)[0][2:] mo_class_param_dict = {} for param in mo_class_params: mo_class_param_dict[param] = None @@ -959,7 +965,7 @@ def process_conf_mos_response(response, api='process_conf_mos_response', raise_exception=True, error_msg='Configuration Error', callback=default_cb, *cbargs): - from imcsdk.imccoreutils import ConfigConfMosConstants as Const + from imcsdk_ecoen66.imccoreutils import ConfigConfMosConstants as Const messages = [] if response[Const.RESPONSE_STATUS] != Const.RESPONSE_STATUS_SUCCESS: for dn, error in sorted(response[Const.RESPONSE_MOS][ diff --git a/imcsdk/imcdriver.py b/imcsdk/imcdriver.py index 1e596bab..13032097 100644 --- a/imcsdk/imcdriver.py +++ b/imcsdk/imcdriver.py @@ -21,8 +21,7 @@ from six.moves.urllib import request as Request from six.moves.urllib.error import HTTPError from six.moves.urllib.request import HTTPRedirectHandler, HTTPSHandler - - +#ssl._create_default_https_context = ssl._create_unverified_context log = logging.getLogger('imc') @@ -75,7 +74,7 @@ def connect(self): # This is the only difference; default wrap_socket uses SSLv23 self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file, - ssl_version=ssl.PROTOCOL_TLSv1) + cert_reqs=ssl.CERT_NONE, ssl_version=ssl.PROTOCOL_TLSv1_2) class TLSHandler(HTTPSHandler): @@ -115,8 +114,10 @@ def connect(self): # Since python 2.7.9, tls 1.1 and 1.2 are supported via # SSLContext ssl_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) + ssl_context.set_ciphers('DEFAULT') ssl_context.options |= ssl.OP_NO_SSLv2 ssl_context.options |= ssl.OP_NO_SSLv3 + raise if self.key_file and self.cert_file: ssl_context.load_cert_chain(keyfile=self.key_file, certfile=self.cert_file) @@ -124,7 +125,7 @@ def connect(self): else: # This is the only difference; default wrap_socket uses SSLv23 self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file, - ssl_version=ssl.PROTOCOL_TLSv1) + ssl_version=ssl.PROTOCOL_TLSv1_2) class ImcDriver(object): diff --git a/imcsdk/imcmo.py b/imcsdk/imcmo.py index 0659f7df..06450dfd 100644 --- a/imcsdk/imcmo.py +++ b/imcsdk/imcmo.py @@ -611,7 +611,7 @@ def from_xml(self, elem, handle=None): print type(obj)\n Outputs: - + """ if elem is None: diff --git a/imcsdk/imcsession.py b/imcsdk/imcsession.py index 5c55f55f..3597c23c 100755 --- a/imcsdk/imcsession.py +++ b/imcsdk/imcsession.py @@ -479,7 +479,7 @@ def _validate_connection(self): return False def _validate_model(self, model): - valid_model_prefixes = ["UCSC", "UCS-E", "UCSS", "HX", "APIC-SERVER-", "DN1", "DN2", "DN3"] + valid_model_prefixes = ["UCSC", "UCS-E", "UCSS", "HX", "APIC-SERVER-", "CNR", "DN1", "DN2", "DN3"] valid_models = ["R460-4640810", "C260-BASE-2646"] if model in valid_models: @@ -545,7 +545,8 @@ def _update_version(self, response=None): firmware = response.out_config.child[0] self._set_version(firmware.version) else: - self._set_version("ancient") + # Default to 1.5(1f) for ancient firmware + self._set_version("1.5(1f)") def _update_domain_name_and_ip(self): from .imcmethodfactory import config_resolve_dn @@ -683,7 +684,7 @@ def _set_platform(self, model=None, platform=None): Internal method to set the platform type Not to be exposed at the handle """ - from imcsdk.imccoreutils import IMC_PLATFORM + from imcsdk_ecoen66.imccoreutils import IMC_PLATFORM modular_platform_prefixes = ["UCSC-C3X", "UCSS-S32"] if platform: self.__platform = platform diff --git a/imcsdk/utils/imcfirmwareinstall.py b/imcsdk/utils/imcfirmwareinstall.py index a72db1e1..fece4bd1 100644 --- a/imcsdk/utils/imcfirmwareinstall.py +++ b/imcsdk/utils/imcfirmwareinstall.py @@ -17,13 +17,13 @@ import logging import re -from imcsdk.imccoreutils import IMC_PLATFORM, get_server_dn -from imcsdk.imcexception import ImcOperationError -from imcsdk.mometa.huu.HuuFirmwareUpdater import HuuFirmwareUpdater, \ +from imcsdk_ecoen66.imccoreutils import IMC_PLATFORM, get_server_dn +from imcsdk_ecoen66.imcexception import ImcOperationError +from imcsdk_ecoen66.mometa.huu.HuuFirmwareUpdater import HuuFirmwareUpdater, \ HuuFirmwareUpdaterConsts -from imcsdk.mometa.huu.HuuFirmwareUpdateStatus import HuuFirmwareUpdateStatus -from imcsdk.mometa.top.TopSystem import TopSystem -from imcsdk.mometa.huu.HuuController import HuuController +from imcsdk_ecoen66.mometa.huu.HuuFirmwareUpdateStatus import HuuFirmwareUpdateStatus +from imcsdk_ecoen66.mometa.top.TopSystem import TopSystem +from imcsdk_ecoen66.mometa.huu.HuuController import HuuController log = logging.getLogger('imc') diff --git a/imcsdk/utils/imcinventory.py b/imcsdk/utils/imcinventory.py index ff455c78..3972b714 100644 --- a/imcsdk/utils/imcinventory.py +++ b/imcsdk/utils/imcinventory.py @@ -17,13 +17,13 @@ import time import logging -from imcsdk.mometa.mgmt.MgmtInventory import MgmtInventory +from imcsdk_ecoen66.mometa.mgmt.MgmtInventory import MgmtInventory log = logging.getLogger('imc') def _get_parent_dn(handle): - from imcsdk.imccoreutils import IMC_PLATFORM + from imcsdk_ecoen66.imccoreutils import IMC_PLATFORM if handle.platform == IMC_PLATFORM.TYPE_CLASSIC: return 'sys' elif handle.platform == IMC_PLATFORM.TYPE_MODULAR: diff --git a/setup.cfg b/setup.cfg index c1fe7763..0bf41e84 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.9.12 +current_version = 0.9.28 commit = False tag = False diff --git a/setup.py b/setup.py index 46d0c80a..2e67da3f 100644 --- a/setup.py +++ b/setup.py @@ -17,18 +17,17 @@ history = history_file.read() setup( - name='imcsdk', - version='0.9.12', + name='imcsdk_ecoen66', + version='0.9.30', description="python SDK for Cisco UCS IMC", long_description=readme + '\n\n' + history, long_description_content_type='text/x-rst', - author="Cisco Systems", - author_email='ucs-python@cisco.com', - url='https://github.com/ciscoucs/imcsdk', + author_email='ecoen@yahoo.com', + url='https://github.com/ecoen66/imcsdk', packages=[ - 'imcsdk', + 'imcsdk_ecoen66', ], - package_dir={'imcsdk': + package_dir={'imcsdk_ecoen66': 'imcsdk'}, include_package_data=True, install_requires=requirements, @@ -49,6 +48,8 @@ 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ], tests_require=test_requirements, test_suite='nose.collector',