Repository :
http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
---------------------------------------------------------------
commit ae39fcc0012e4823ed0176171461c2720c84572a
Author: Peter Hatina <phatina(a)redhat.com>
Date: Tue Oct 23 14:39:29 2012 +0200
rename fmci to lmi
---------------------------------------------------------------
cli-tools/fmci/makefile.am | 12 -----
cli-tools/{fmci-ip.py => lmi-ip.py} | 40 +++++++++---------
cli-tools/{fmci-power.py => lmi-power.py} | 14 +++---
cli-tools/{fmci-service.py => lmi-service.py} | 14 +++---
cli-tools/{fmci-shell.py => lmi-shell.py} | 16 ++++----
cli-tools/{fmci-user.py => lmi-user.py} | 14 +++---
cli-tools/{fmci => lmi}/__init__.py | 0
.../{fmci/fmci_address.py => lmi/lmi_address.py} | 44 ++++++++++----------
.../fmci_client_base.py => lmi/lmi_client_base.py} | 2 +-
.../fmci_client_ip.py => lmi/lmi_client_ip.py} | 26 ++++++------
.../lmi_client_power.py} | 14 +++---
.../lmi_client_service.py} | 10 ++--
.../lmi_client_shell.py} | 42 +++++++++---------
.../fmci_client_user.py => lmi/lmi_client_user.py} | 22 +++++-----
.../{fmci/fmci_options.py => lmi/lmi_options.py} | 2 +-
cli-tools/lmi/makefile.am | 12 +++++
cli-tools/makefile.am | 12 +++---
17 files changed, 148 insertions(+), 148 deletions(-)
diff --git a/cli-tools/fmci/makefile.am b/cli-tools/fmci/makefile.am
deleted file mode 100644
index 2f03b4c..0000000
--- a/cli-tools/fmci/makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-fmci_PYTHON = \
- fmci_address.py \
- fmci_client_base.py \
- fmci_client_ip.py \
- fmci_client_power.py \
- fmci_client_service.py \
- fmci_client_shell.py \
- fmci_client_user.py \
- fmci_options.py \
- __init__.py
-
-fmcidir = $(pythondir)/fmci
diff --git a/cli-tools/fmci-ip.py b/cli-tools/lmi-ip.py
similarity index 79%
rename from cli-tools/fmci-ip.py
rename to cli-tools/lmi-ip.py
index 2c4986e..29fee3c 100755
--- a/cli-tools/fmci-ip.py
+++ b/cli-tools/lmi-ip.py
@@ -17,11 +17,11 @@
import os
import sys
-from fmci.fmci_options import FmciBasicOptions
-from fmci.fmci_address import FmciIpv4Addr, FmciHostGenerator
-from fmci.fmci_client_ip import FmciIpClient
+from lmi.lmi_options import LmiBasicOptions
+from lmi.lmi_address import LmiIpv4Addr, LmiHostGenerator
+from lmi.lmi_client_ip import LmiIpClient
-class FmciIpOptions(FmciBasicOptions):
+class LmiIpOptions(LmiBasicOptions):
OBJ_UNKNOWN, OBJ_ADDR, OBJ_ROUTE = range(3)
OP_UNKNOWN, OP_SHOW, OP_SET, OP_DEL = range(4)
@@ -34,8 +34,8 @@ class FmciIpOptions(FmciBasicOptions):
" addr del dev [interface]\n")
self.m_parser.set_usage("Usage: %prog [options] object [command] (dev
[device])")
self.m_good = True
- self.m_operation = FmciIpOptions.OP_UNKNOWN
- self.m_object = FmciIpOptions.OBJ_UNKNOWN
+ self.m_operation = LmiIpOptions.OP_UNKNOWN
+ self.m_object = LmiIpOptions.OBJ_UNKNOWN
self.m_device = ""
self.m_ifaddr = ""
@@ -81,21 +81,21 @@ class FmciIpOptions(FmciBasicOptions):
self.__parseDev()
def __parseOpShow(self):
- self.m_operation = FmciIpOptions.OP_SHOW
+ self.m_operation = LmiIpOptions.OP_SHOW
arg = self.m_pos_options[0] if len(self.m_pos_options) else ""
if arg:
self.__parseDev()
def __parseOpSet(self):
- self.m_operation = FmciIpOptions.OP_SET
+ self.m_operation = LmiIpOptions.OP_SET
self.__parseOpWithIfaddr()
def __parseOpDel(self):
- self.m_operation = FmciIpOptions.OP_DEL
+ self.m_operation = LmiIpOptions.OP_DEL
self.__parseDev()
def __parseAddr(self):
- self.m_object = FmciIpOptions.OBJ_ADDR
+ self.m_object = LmiIpOptions.OBJ_ADDR
arg = self.__posOptionsPopFront()
if arg == "show":
self.__parseOpShow()
@@ -104,11 +104,11 @@ class FmciIpOptions(FmciBasicOptions):
elif arg == "del":
self.__parseOpDel()
else:
- self.m_operation = FmciIpOptions.OP_UNKNOWN
+ self.m_operation = LmiIpOptions.OP_UNKNOWN
self.m_good = False
def __parseRoute(self):
- self.m_object = FmciIpOptions.OBJ_ROUTE
+ self.m_object = LmiIpOptions.OBJ_ROUTE
def parseCmds(self):
arg = self.__posOptionsPopFront()
@@ -120,7 +120,7 @@ class FmciIpOptions(FmciBasicOptions):
self.m_good = False
if __name__ == "__main__":
- options = FmciIpOptions()
+ options = LmiIpOptions()
options.parse(sys.argv)
if not options.good:
options.printWrongUsage()
@@ -131,24 +131,24 @@ if __name__ == "__main__":
sys.exit(1)
client_failed = False
- client_hostnames = FmciHostGenerator.enumerate(options.hostname)
+ client_hostnames = LmiHostGenerator.enumerate(options.hostname)
for client_hostname in client_hostnames:
if not client_hostname:
continue
- client = FmciIpClient(client_hostname.name, options.username, options.password)
+ client = LmiIpClient(client_hostname.name, options.username, options.password)
rval = True
errorstr = ""
- if options.object == FmciIpOptions.OBJ_ADDR:
- if options.operation == FmciIpOptions.OP_SHOW:
+ if options.object == LmiIpOptions.OBJ_ADDR:
+ if options.operation == LmiIpOptions.OP_SHOW:
if options.device:
(rval, errorstr) = client.ipListDevices(options.device)
else:
(rval, errorstr) = client.ipListDevices()
- elif options.operation == FmciIpOptions.OP_SET:
+ elif options.operation == LmiIpOptions.OP_SET:
(rval, errorstr) = client.ipSetAddress(options.device, options.ifaddr)
- elif options.operation == FmciIpOptions.OP_DEL:
+ elif options.operation == LmiIpOptions.OP_DEL:
(rval, errorstr) = client.ipDelAddress(options.device)
- elif options.object == FmciIpOptions.OBJ_ROUTE:
+ elif options.object == LmiIpOptions.OBJ_ROUTE:
# TODO: implement
sys.stderr.write("Route operation not implemented yet!\n")
sys.exit(1)
diff --git a/cli-tools/fmci-power.py b/cli-tools/lmi-power.py
similarity index 85%
rename from cli-tools/fmci-power.py
rename to cli-tools/lmi-power.py
index d90a6d3..08b7e28 100755
--- a/cli-tools/fmci-power.py
+++ b/cli-tools/lmi-power.py
@@ -16,11 +16,11 @@
import sys
-from fmci.fmci_options import FmciBasicOptions
-from fmci.fmci_address import FmciIpv4Addr, FmciHostGenerator
-from fmci.fmci_client_power import FmciPowerClient
+from lmi.lmi_options import LmiBasicOptions
+from lmi.lmi_address import LmiIpv4Addr, LmiHostGenerator
+from lmi.lmi_client_power import LmiPowerClient
-class FmciPowerOptions(FmciBasicOptions):
+class LmiPowerOptions(LmiBasicOptions):
def __init__(self):
super(self.__class__, self).__init__(
"Available actions:\n"
@@ -37,19 +37,19 @@ class FmciPowerOptions(FmciBasicOptions):
return self.m_pos_options[0] if self.good and self.m_pos_options[0] else
""
if __name__ == "__main__":
- options = FmciPowerOptions()
+ options = LmiPowerOptions()
options.parse(sys.argv)
if not options.good:
options.printWrongUsage()
sys.exit(1)
client_failed = False
- client_hostnames = FmciHostGenerator.enumerate(options.hostname)
+ client_hostnames = LmiHostGenerator.enumerate(options.hostname)
client_action = options.action.lower()
for client_hostname in client_hostnames:
if not client_hostname:
continue
- client = FmciPowerClient(client_hostname.name, options.username,
options.password)
+ client = LmiPowerClient(client_hostname.name, options.username,
options.password)
actions = {
"reboot": (client.reboot, "Reboot: "),
"poweroff": (client.poweroff, "Poweroff: "),
diff --git a/cli-tools/fmci-service.py b/cli-tools/lmi-service.py
similarity index 88%
rename from cli-tools/fmci-service.py
rename to cli-tools/lmi-service.py
index b446cf8..48aa909 100755
--- a/cli-tools/fmci-service.py
+++ b/cli-tools/lmi-service.py
@@ -16,11 +16,11 @@
import sys
-from fmci.fmci_options import FmciBasicOptions
-from fmci.fmci_address import FmciIpv4Addr, FmciHostGenerator
-from fmci.fmci_client_service import FmciServiceClient
+from lmi.lmi_options import LmiBasicOptions
+from lmi.lmi_address import LmiIpv4Addr, LmiHostGenerator
+from lmi.lmi_client_service import LmiServiceClient
-class FmciServiceOptions(FmciBasicOptions):
+class LmiServiceOptions(LmiBasicOptions):
def __init__(self):
super(self.__class__, self).__init__(
"Available actions:\n"
@@ -44,19 +44,19 @@ class FmciServiceOptions(FmciBasicOptions):
return self.m_pos_options[1] if self.good and self.m_pos_options[1] else
""
if __name__ == "__main__":
- options = FmciServiceOptions()
+ options = LmiServiceOptions()
options.parse(sys.argv)
if not options.good:
options.printWrongUsage()
sys.exit(1)
client_failed = False
- client_hostnames = FmciHostGenerator.enumerate(options.hostname)
+ client_hostnames = LmiHostGenerator.enumerate(options.hostname)
client_action = options.action.lower()
for client_hostname in client_hostnames:
if not client_hostname:
continue
- client = FmciServiceClient(client_hostname.name, options.username,
options.password)
+ client = LmiServiceClient(client_hostname.name, options.username,
options.password)
(service, errorstr) = client.serviceFind(options.service)
if not service:
sys.stderr.write("%s: %s\n" % (client_hostname.name, errorstr))
diff --git a/cli-tools/fmci-shell.py b/cli-tools/lmi-shell.py
old mode 100644
new mode 100755
similarity index 85%
rename from cli-tools/fmci-shell.py
rename to cli-tools/lmi-shell.py
index 3825cf4..8016f61
--- a/cli-tools/fmci-shell.py
+++ b/cli-tools/lmi-shell.py
@@ -17,15 +17,15 @@
import os
import sys
import code
-from fmci.fmci_client_shell import FmciShellClient
+from lmi.lmi_client_shell import LmiShellClient
-class FmciInteractiveShell(code.InteractiveConsole):
+class LmiInteractiveShell(code.InteractiveConsole):
def __init__(self, prompt, more_prompt, locals = None):
sys.ps1 = prompt
sys.ps2 = more_prompt
if locals == None:
locals = {}
- locals["FmciShellClient"] = FmciShellClient
+ locals["LmiShellClient"] = LmiShellClient
locals["connect"] = connect
code.InteractiveConsole.__init__(self, locals)
@@ -61,8 +61,8 @@ class FmciInteractiveShell(code.InteractiveConsole):
self.resetbuffer()
more = 0
-def fmci_interact(prompt = "> ", more_prompt = "... "):
- console = FmciInteractiveShell(prompt, more_prompt)
+def lmi_interact(prompt = "> ", more_prompt = "... "):
+ console = LmiInteractiveShell(prompt, more_prompt)
try:
import readline
except ImportError:
@@ -70,13 +70,13 @@ def fmci_interact(prompt = "> ", more_prompt = "...
"):
console.interact()
def connect(hostname, username = "", password = ""):
- return FmciShellClient(hostname, username, password)
+ return LmiShellClient(hostname, username, password)
if __name__ == "__main__":
if len(sys.argv) < 2:
- fmci_interact()
+ lmi_interact()
else:
- locals = { "FmciShellClient" : FmciShellClient }
+ locals = { "LmiShellClient" : LmiShellClient }
i = 1
while sys.argv[i].startswith("-"):
i += 1
diff --git a/cli-tools/fmci-user.py b/cli-tools/lmi-user.py
similarity index 94%
rename from cli-tools/fmci-user.py
rename to cli-tools/lmi-user.py
index 64ce6e3..12bdbc9 100755
--- a/cli-tools/fmci-user.py
+++ b/cli-tools/lmi-user.py
@@ -17,11 +17,11 @@
import os
import sys
-from fmci.fmci_options import FmciBasicOptions
-from fmci.fmci_address import FmciIpv4Addr, FmciHostGenerator
-from fmci.fmci_client_user import FmciUserClient
+from lmi.lmi_options import LmiBasicOptions
+from lmi.lmi_address import LmiIpv4Addr, LmiHostGenerator
+from lmi.lmi_client_user import LmiUserClient
-class FmciUserOptions(FmciBasicOptions):
+class LmiUserOptions(LmiBasicOptions):
def __init__(self):
script_name = os.path.basename(__file__)
super(self.__class__, self).__init__(
@@ -133,19 +133,19 @@ class FmciUserOptions(FmciBasicOptions):
return self.m_options.uid if self.good and self.m_options.uid else ""
if __name__ == "__main__":
- options = FmciUserOptions()
+ options = LmiUserOptions()
options.parse(sys.argv)
if not options.good:
options.printWrongUsage()
sys.exit(1)
client_failed = False
- client_hostnames = FmciHostGenerator.enumerate(options.hostname)
+ client_hostnames = LmiHostGenerator.enumerate(options.hostname)
client_action = options.action.lower()
for client_hostname in client_hostnames:
if not client_hostname:
continue
- client = FmciUserClient(client_hostname.name, options.username,
options.password)
+ client = LmiUserClient(client_hostname.name, options.username, options.password)
actions = {
"list-users" : client.listUsers,
"list-groups" : client.listGroups
diff --git a/cli-tools/fmci/__init__.py b/cli-tools/lmi/__init__.py
similarity index 100%
rename from cli-tools/fmci/__init__.py
rename to cli-tools/lmi/__init__.py
diff --git a/cli-tools/fmci/fmci_address.py b/cli-tools/lmi/lmi_address.py
similarity index 85%
rename from cli-tools/fmci/fmci_address.py
rename to cli-tools/lmi/lmi_address.py
index da4b832..119af2b 100644
--- a/cli-tools/fmci/fmci_address.py
+++ b/cli-tools/lmi/lmi_address.py
@@ -17,21 +17,21 @@ import re
import sys
import itertools
-class FmciHost(object):
+class LmiHost(object):
def __init__(self, host):
self.m_host = host
@property
def name(self):
- if isinstance(self.m_host, FmciIpv4Addr):
+ if isinstance(self.m_host, LmiIpv4Addr):
return self.m_host.address
- elif isinstance(self.m_host, FmciIpv6Addr):
+ elif isinstance(self.m_host, LmiIpv6Addr):
return self.m_host.address
else:
return self.m_host
-class FmciIpv4Addr(object):
- class FmciIpv4Member(object):
+class LmiIpv4Addr(object):
+ class LmiIpv4Member(object):
def __init__(self, member):
self.m_member = member
@@ -95,7 +95,7 @@ class FmciIpv4Addr(object):
return []
members = []
for m in str_members:
- members.append(FmciIpv4Addr.FmciIpv4Member(m))
+ members.append(LmiIpv4Addr.LmiIpv4Member(m))
addresses = members[-1].enumerate()
if not addresses:
return []
@@ -109,10 +109,10 @@ class FmciIpv4Addr(object):
addresses = combined
rval = []
for addr in sorted(set(addresses)):
- rval.append(FmciHost(FmciIpv4Addr(addr)))
+ rval.append(LmiHost(LmiIpv4Addr(addr)))
return rval
-class FmciIpv6Addr(object):
+class LmiIpv6Addr(object):
def __init__(self, addr):
self.m_addr = addr
@@ -120,7 +120,7 @@ class FmciIpv6Addr(object):
def address(self):
return self.m_addr
- class FmciIpv6Member(object):
+ class LmiIpv6Member(object):
def __init__(self, member):
self.m_member = member
@@ -151,7 +151,7 @@ class FmciIpv6Addr(object):
str_members = pattern.split(":")
members = []
for m in str_members:
- members.append(FmciIpv6Addr.FmciIpv6Member(m))
+ members.append(LmiIpv6Addr.LmiIpv6Member(m))
addresses = members[-1].enumerate()
if not addresses:
return []
@@ -165,10 +165,10 @@ class FmciIpv6Addr(object):
addresses = combined
rval = []
for addr in sorted(set(addresses)):
- rval.append(FmciHost(FmciIpv6Addr(addr)))
+ rval.append(LmiHost(LmiIpv6Addr(addr)))
return rval
-class FmciHostGenerator(object):
+class LmiHostGenerator(object):
PATTERN_TYPE_FQDN, \
PATTERN_TYPE_IPV4, \
PATTERN_TYPE_IPV6 = range(3)
@@ -183,7 +183,7 @@ class FmciHostGenerator(object):
"}|[\d]{1,3}-[\d]{1,3})(;([\d]{1,3}|[\d]{1,3}-[\d]{1"
",3}))*\}))\.(([\d]{1,3})|(\{([\d]{1,3}|[\d]{1,3}-["
"\d]{1,3})(;([\d]{1,3}|[\d]{1,3}-[\d]{1,3}))*\}))$",
- FmciHostGenerator.PATTERN_TYPE_IPV4),
+ LmiHostGenerator.PATTERN_TYPE_IPV4),
("^(([\da-fA-F]{1,4})|(\{([\da-fA-F]{1,4}|[\da-fA-F]{"
"1,4}-[\da-fA-F]{1,4})(;([\da-fA-F]{1,4}|[\da-fA-F]"
"{1,4}-[\da-fA-F]{1,4}))*\})){0,1}(:(([\da-fA-F]{1,"
@@ -192,24 +192,24 @@ class FmciHostGenerator(object):
"]{1,4}))*\})*)){0,6}:(([\da-fA-F]{1,4})|(\{([\da-f"
"A-F]{1,4}|[\da-fA-F]{1,4}-[\da-fA-F]{1,4})(;([\da-f"
"A-F]{1,4}|[\da-fA-F]{1,4}-[\da-fA-F]{1,4}))*\}))$",
- FmciHostGenerator.PATTERN_TYPE_IPV6)
+ LmiHostGenerator.PATTERN_TYPE_IPV6)
)
for (p, rval) in pattern_regexps:
if re.match(p, pattern):
return rval
- return FmciHostGenerator.PATTERN_TYPE_FQDN
+ return LmiHostGenerator.PATTERN_TYPE_FQDN
@staticmethod
def enumerate(lst):
rval = []
for pattern in lst.split(","):
- pattern_type = FmciHostGenerator.recognizePatternType(pattern)
- if pattern_type == FmciHostGenerator.PATTERN_TYPE_FQDN:
- rval.append(FmciHost(pattern))
- elif pattern_type == FmciHostGenerator.PATTERN_TYPE_IPV4:
- rval.extend(FmciIpv4Addr.enumerate(pattern))
- elif pattern_type == FmciHostGenerator.PATTERN_TYPE_IPV6:
- rval.extend(FmciIpv6Addr.enumerate(pattern))
+ pattern_type = LmiHostGenerator.recognizePatternType(pattern)
+ if pattern_type == LmiHostGenerator.PATTERN_TYPE_FQDN:
+ rval.append(LmiHost(pattern))
+ elif pattern_type == LmiHostGenerator.PATTERN_TYPE_IPV4:
+ rval.extend(LmiIpv4Addr.enumerate(pattern))
+ elif pattern_type == LmiHostGenerator.PATTERN_TYPE_IPV6:
+ rval.extend(LmiIpv6Addr.enumerate(pattern))
else:
sys.stderr.write("Unrecognized host pattern supplied!\n")
return []
diff --git a/cli-tools/fmci/fmci_client_base.py b/cli-tools/lmi/lmi_client_base.py
similarity index 99%
rename from cli-tools/fmci/fmci_client_base.py
rename to cli-tools/lmi/lmi_client_base.py
index 48b61cf..0a26972 100644
--- a/cli-tools/fmci/fmci_client_base.py
+++ b/cli-tools/lmi/lmi_client_base.py
@@ -15,7 +15,7 @@
import pywbem
-class FmciBaseClient(object):
+class LmiBaseClient(object):
def __init__(self, hostname, username = "", password = ""):
self.m_hostname = hostname
self.m_username = username
diff --git a/cli-tools/fmci/fmci_client_ip.py b/cli-tools/lmi/lmi_client_ip.py
similarity index 85%
rename from cli-tools/fmci/fmci_client_ip.py
rename to cli-tools/lmi/lmi_client_ip.py
index d86b8dd..0d15b02 100644
--- a/cli-tools/fmci/fmci_client_ip.py
+++ b/cli-tools/lmi/lmi_client_ip.py
@@ -15,10 +15,10 @@
import sys
import pywbem
-from fmci_client_base import FmciBaseClient
-from fmci_address import FmciIpv4Addr
+from lmi_client_base import LmiBaseClient
+from lmi_address import LmiIpv4Addr
-class FmciIpClient(FmciBaseClient):
+class LmiIpClient(LmiBaseClient):
LMI_ETHERNET_PORT_CLASS_NAME = "LMI_EthernetPort"
LMI_IP_ASSIGNMENT_SETTING_DATA_CLASS_NAME = "LMI_IPAssignmentSettingData"
IP_CONFIGURATION_SERVICE_CLASS_NAME = "LMI_IPConfigurationService"
@@ -30,7 +30,7 @@ class FmciIpClient(FmciBaseClient):
super(self.__class__, self).__init__(hostname, username, password)
def __ipGetIpProtocolEndpointInstances(self, device = ""):
- (inst_list, errorstr) =
self._getInstances(FmciIpClient.IP_PROTOCOL_ENDPOINT_CLASS_NAME)
+ (inst_list, errorstr) =
self._getInstances(LmiIpClient.IP_PROTOCOL_ENDPOINT_CLASS_NAME)
if not inst_list:
return (None, errorstr)
rval_inst_list = filter(lambda n: device ==
n["Name"].split("_")[0], inst_list) if device else inst_list
@@ -47,16 +47,16 @@ class FmciIpClient(FmciBaseClient):
def __ipGetAddressType(self, address):
# blind ipv4 check
- prot_type = FmciIpClient.IP_PROTOCOL_TYPE_IPV6
+ prot_type = LmiIpClient.IP_PROTOCOL_TYPE_IPV6
if address.count(".") == 3:
- prot_type = FmciIpClient.IP_PROTOCOL_TYPE_IPV4
+ prot_type = LmiIpClient.IP_PROTOCOL_TYPE_IPV4
return prot_type
def __ipGetEthernetPortInstance(self, device):
- return self._getInstances(FmciIpClient.LMI_ETHERNET_PORT_CLASS_NAME, device, Key
= "DeviceID")
+ return self._getInstances(LmiIpClient.LMI_ETHERNET_PORT_CLASS_NAME, device, Key =
"DeviceID")
def __ipGetIpAssignmentSettingData(self, device):
- (inst_list, errorstr) =
self._getInstances(FmciIpClient.LMI_IP_ASSIGNMENT_SETTING_DATA_CLASS_NAME)
+ (inst_list, errorstr) =
self._getInstances(LmiIpClient.LMI_IP_ASSIGNMENT_SETTING_DATA_CLASS_NAME)
if not inst_list:
return (None, errorstr)
inst_list = inst_list if type(inst_list) == list else [inst_list]
@@ -86,12 +86,12 @@ class FmciIpClient(FmciBaseClient):
"ProtocolIFType" : pywbem.Uint16(prot_type),
"Port" : device_inst.path
}
- if prot_type == FmciIpClient.IP_PROTOCOL_TYPE_IPV4:
- args["IPv4Address"] = FmciIpv4Addr(address).address
+ if prot_type == LmiIpClient.IP_PROTOCOL_TYPE_IPV4:
+ args["IPv4Address"] = LmiIpv4Addr(address).address
if "SubnetMask" in kwargs:
args["IPv4SubnetMask"] = kwargs["SubnetMask"]
else:
- args["IPv4SubnetMask"] = FmciIpv4Addr(address).netmask
+ args["IPv4SubnetMask"] = LmiIpv4Addr(address).netmask
if "DefaultGateway" in kwargs:
args["IPv4DefaultGateway"] =
kwargs["DefaultGateway"]
if "DNSServers" in kwargs:
@@ -108,13 +108,13 @@ class FmciIpClient(FmciBaseClient):
args["IPv6SearchDomains"] = kwargs["SearchDomains"]
if "PrefixLength" in kwargs:
args["IPv6PrefixLength"] =
pywbem.Uint8(kwargs["PrefixLength"])
- (configuration_inst, errorstr) =
self._getInstances(FmciIpClient.IP_CONFIGURATION_SERVICE_CLASS_NAME)
+ (configuration_inst, errorstr) =
self._getInstances(LmiIpClient.IP_CONFIGURATION_SERVICE_CLASS_NAME)
if not configuration_inst:
return (False, {}, errorstr)
return self._callMethod(configuration_inst, "CreateStaticSetting",
**args)
def __ipApplyStaticSetting(self, device, setting_inst):
- (configuration_inst, errorstr) =
self._getInstances(FmciIpClient.IP_CONFIGURATION_SERVICE_CLASS_NAME)
+ (configuration_inst, errorstr) =
self._getInstances(LmiIpClient.IP_CONFIGURATION_SERVICE_CLASS_NAME)
if not configuration_inst:
return (False, errorstr)
(device_inst, errorstr) = self.__ipGetIpProtocolEndpointInstances(device)
diff --git a/cli-tools/fmci/fmci_client_power.py b/cli-tools/lmi/lmi_client_power.py
similarity index 78%
rename from cli-tools/fmci/fmci_client_power.py
rename to cli-tools/lmi/lmi_client_power.py
index 2273df5..8df335e 100644
--- a/cli-tools/fmci/fmci_client_power.py
+++ b/cli-tools/lmi/lmi_client_power.py
@@ -14,9 +14,9 @@
# along with this program; if not, see <
http://www.gnu.org/licenses/>.
import pywbem
-from fmci_client_base import FmciBaseClient
+from lmi_client_base import LmiBaseClient
-class FmciPowerClient(FmciBaseClient):
+class LmiPowerClient(LmiBaseClient):
POWER_CLASS_NAME = "LMI_PowerManagementService"
POWER_STATE_SUSPEND = 4
POWER_STATE_FORCE_REBOOT = 5
@@ -29,7 +29,7 @@ class FmciPowerClient(FmciBaseClient):
super(self.__class__, self).__init__(hostname, username, password)
def __powerCallMethod(self, method, **params):
- (inst, rparam) = self._getInstances(FmciPowerClient.POWER_CLASS_NAME)
+ (inst, rparam) = self._getInstances(LmiPowerClient.POWER_CLASS_NAME)
if not inst:
return (False, rparam)
(rval, _, errorstr) = self._callMethod(inst[0], method, **params)
@@ -38,16 +38,16 @@ class FmciPowerClient(FmciBaseClient):
def poweroff(self):
return self.__powerCallMethod("RequestPowerStateChange",
- PowerState=pywbem.Uint16(FmciPowerClient.POWER_STATE_POWEROFF))
+ PowerState=pywbem.Uint16(LmiPowerClient.POWER_STATE_POWEROFF))
def reboot(self):
return self.__powerCallMethod("RequestPowerStateChange",
- PowerState=pywbem.Uint16(FmciPowerClient.POWER_STATE_REBOOT))
+ PowerState=pywbem.Uint16(LmiPowerClient.POWER_STATE_REBOOT))
def suspend(self):
return self.__powerCallMethod("RequestPowerStateChange",
- PowerState=pywbem.Uint16(FmciPowerClient.POWER_STATE_SUSPEND))
+ PowerState=pywbem.Uint16(LmiPowerClient.POWER_STATE_SUSPEND))
def hibernate(self):
return self.__powerCallMethod("RequestPowerStateChange",
- PowerState=pywbem.Uint16(FmciPowerClient.POWER_STATE_HIBERNATE))
+ PowerState=pywbem.Uint16(LmiPowerClient.POWER_STATE_HIBERNATE))
diff --git a/cli-tools/fmci/fmci_client_service.py b/cli-tools/lmi/lmi_client_service.py
similarity index 95%
rename from cli-tools/fmci/fmci_client_service.py
rename to cli-tools/lmi/lmi_client_service.py
index 3f78762..3008f84 100644
--- a/cli-tools/fmci/fmci_client_service.py
+++ b/cli-tools/lmi/lmi_client_service.py
@@ -14,9 +14,9 @@
# along with this program; if not, see <
http://www.gnu.org/licenses/>.
import pywbem
-from fmci_client_base import FmciBaseClient
+from lmi_client_base import LmiBaseClient
-class FmciService(object):
+class LmiService(object):
def __init__(self, client, inst):
self.m_client = client
self.m_instance = inst
@@ -54,7 +54,7 @@ class FmciService(object):
def status(self):
return self.m_client.serviceStatus(self.m_instance)
-class FmciServiceClient(FmciBaseClient):
+class LmiServiceClient(LmiBaseClient):
SERVICE_CLASS_NAME = "LMI_Service"
def __init__(self, hostname, username = "", password = ""):
@@ -62,7 +62,7 @@ class FmciServiceClient(FmciBaseClient):
def __serviceGetInstance(self, service):
(inst, errorstr) = self._getInstances(
- FmciServiceClient.SERVICE_CLASS_NAME, service,
+ LmiServiceClient.SERVICE_CLASS_NAME, service,
ErrorMsg = "No such service '" + service + "'
found")
if not inst:
return (None, errorstr)
@@ -85,7 +85,7 @@ class FmciServiceClient(FmciBaseClient):
(inst, errorstr) = self.__serviceGetInstance(service)
if not inst:
return (None, errorstr)
- return (FmciService(self, inst), "")
+ return (LmiService(self, inst), "")
def serviceStart(self, service):
return self.__serviceCallMethod(service, "StartService")
diff --git a/cli-tools/fmci/fmci_client_shell.py b/cli-tools/lmi/lmi_client_shell.py
similarity index 87%
rename from cli-tools/fmci/fmci_client_shell.py
rename to cli-tools/lmi/lmi_client_shell.py
index 3d26420..7417aaa 100644
--- a/cli-tools/fmci/fmci_client_shell.py
+++ b/cli-tools/lmi/lmi_client_shell.py
@@ -17,30 +17,30 @@ import new
import sys
import pywbem
import inspect
-from fmci_client_base import FmciBaseClient
+from lmi_client_base import LmiBaseClient
-class FmciErrorHandler(object):
+class LmiErrorHandler(object):
def __init__(self, errormsg):
super(self.__class__, self).__init__()
if errormsg:
sys.stderr.write("Error: %s\n" % errormsg)
def __getattr__(self, name):
- return FmciErrorHandler("")
+ return LmiErrorHandler("")
def __call__(self, *args, **kwargs):
- return FmciErrorHandler("")
+ return LmiErrorHandler("")
def __iter__(self):
- return FmciErrorHandler("")
+ return LmiErrorHandler("")
def __getitem__(self, key):
- return FmciErrorHandler("")
+ return LmiErrorHandler("")
def __str__(self):
return ""
-class FmciNamespace(object):
+class LmiNamespace(object):
def __init__(self, client, name):
super(self.__class__, self).__init__()
self.m_client = client
@@ -51,8 +51,8 @@ class FmciNamespace(object):
return self.m_name
(klass, errorstr) = self.m_client.getClass(name, self.m_name)
if not klass:
- return FmciErrorHandler("Error: %s" % errorstr)
- return FmciClass(self.m_client, self, klass)
+ return LmiErrorHandler("Error: %s" % errorstr)
+ return LmiClass(self.m_client, self, klass)
def printClasses(self, filter_key = "", exact_match = False):
(class_name_list, errorstr) = self.m_client.getClassNames(self.m_name)
@@ -71,7 +71,7 @@ class FmciNamespace(object):
for c in class_name_list:
sys.stdout.write("%s\n" % c)
-class FmciClass(object):
+class LmiClass(object):
def __init__(self, client, namespace, klass):
super(self.__class__, self).__init__()
self.m_client = client
@@ -92,16 +92,16 @@ class FmciClass(object):
def instances(self, filter_key = "", **kwargs):
instance_list = self.m_client.getInstances(self.m_klass.classname, filter_key,
**kwargs)
if not instance_list:
- return FmciErrorHandler("'%s' instance does not exist" %
filter_key)
+ return LmiErrorHandler("'%s' instance does not exist" %
filter_key)
result = []
for i in instance_list:
- result.append(FmciInstance(self.m_client, self, i))
+ result.append(LmiInstance(self.m_client, self, i))
return result
def firstInstance(self, filter_key = "", **kwargs):
instance_list = self.instances(filter_key, **kwargs)
if not instance_list:
- return FmciErrorHandler("'%s' instance does not exist" %
filter_key)
+ return LmiErrorHandler("'%s' instance does not exist" %
filter_key)
return instance_list[0]
def printProperties(self, detailed = False):
@@ -138,8 +138,8 @@ class FmciClass(object):
def namespace(self):
return self.m_namespace.name
-class FmciInstance(object):
- class FmciInstanceMethod(object):
+class LmiInstance(object):
+ class LmiInstanceMethod(object):
def __init__(self, client, instance, method):
super(self.__class__, self).__init__()
self.m_client = client
@@ -178,9 +178,9 @@ class FmciInstance(object):
def __getattr__(self, name):
methods = self.__methods()
if methods and name in methods:
- return FmciInstance.FmciInstanceMethod(self.m_client, self,
self.__method(name))
+ return LmiInstance.LmiInstanceMethod(self.m_client, self,
self.__method(name))
elif not name in self.m_inst.properties.keys():
- return FmciErrorHandler("'%s' is not valid property of the class
'%s'" % (name, self.m_klass.classname))
+ return LmiErrorHandler("'%s' is not valid property of the class
'%s'" % (name, self.m_klass.classname))
return self.m_inst.properties[name].value
def __getitem__(self, key):
@@ -211,7 +211,7 @@ class FmciInstance(object):
def printMethods(self, detailed = False):
self.m_klass.printMethods(detailed)
-class FmciShellClient(FmciBaseClient):
+class LmiShellClient(LmiBaseClient):
def __init__(self, hostname, username = "", password = ""):
super(self.__class__, self).__init__(hostname, username, password)
@@ -237,12 +237,12 @@ class FmciShellClient(FmciBaseClient):
@property
def root(self):
- return FmciNamespace(self, "root")
+ return LmiNamespace(self, "root")
@property
def cimv2(self):
- return FmciNamespace(self, "root/cimv2")
+ return LmiNamespace(self, "root/cimv2")
@property
def interop(self):
- return FmciNamespace(self, "root/interop")
+ return LmiNamespace(self, "root/interop")
diff --git a/cli-tools/fmci/fmci_client_user.py b/cli-tools/lmi/lmi_client_user.py
similarity index 86%
rename from cli-tools/fmci/fmci_client_user.py
rename to cli-tools/lmi/lmi_client_user.py
index b1c283c..783d3e6 100644
--- a/cli-tools/fmci/fmci_client_user.py
+++ b/cli-tools/lmi/lmi_client_user.py
@@ -15,9 +15,9 @@
import sys
import pywbem
-from fmci_client_base import FmciBaseClient
+from lmi_client_base import LmiBaseClient
-class FmciUserClient(FmciBaseClient):
+class LmiUserClient(LmiBaseClient):
USER_CLASS_NAME = "LMI_Account"
GROUP_CLASS_NAME = "LMI_Group"
MEMBER_OF_GROUP_CLASS_NAME = "LMI_MemberOfGroup"
@@ -29,19 +29,19 @@ class FmciUserClient(FmciBaseClient):
super(self.__class__, self).__init__(hostname, username, password)
def __getUserInstances(self):
- return self._getInstances(FmciUserClient.USER_CLASS_NAME)
+ return self._getInstances(LmiUserClient.USER_CLASS_NAME)
def __getGroupInstances(self):
- return self._getInstances(FmciUserClient.GROUP_CLASS_NAME)
+ return self._getInstances(LmiUserClient.GROUP_CLASS_NAME)
def __getAccountManagementInstance(self):
- (inst, errorstr) =
self._getInstances(FmciUserClient.ACCOUNT_MANAGEMENT_SERVICE_CLASS_NAME)
+ (inst, errorstr) =
self._getInstances(LmiUserClient.ACCOUNT_MANAGEMENT_SERVICE_CLASS_NAME)
if not inst:
return (None, errorstr)
return (inst[0], "")
def __getComputerSystemInstance(self):
- (inst, errorstr) = self._getInstances(FmciUserClient.COMPUTER_SYSTEM_CLASS_NAME)
+ (inst, errorstr) = self._getInstances(LmiUserClient.COMPUTER_SYSTEM_CLASS_NAME)
if not inst:
return (None, errorstr)
return (inst[0], "")
@@ -49,10 +49,10 @@ class FmciUserClient(FmciBaseClient):
def __getMemberGroups(self, inst):
members = []
identities = self.m_cliconn.Associators(inst.path,
- AssocClass = FmciUserClient.ASSIGNED_IDENTITY_CLASS_NAME)
+ AssocClass = LmiUserClient.ASSIGNED_IDENTITY_CLASS_NAME)
for identity in identities:
accounts = self.m_cliconn.Associators(identity.path,
- AssocClass = FmciUserClient.MEMBER_OF_GROUP_CLASS_NAME)
+ AssocClass = LmiUserClient.MEMBER_OF_GROUP_CLASS_NAME)
members.extend(accounts)
return members
@@ -60,10 +60,10 @@ class FmciUserClient(FmciBaseClient):
members = []
for g in inst:
identities = self.m_cliconn.Associators(g.path,
- AssocClass = FmciUserClient.MEMBER_OF_GROUP_CLASS_NAME)
+ AssocClass = LmiUserClient.MEMBER_OF_GROUP_CLASS_NAME)
for i in identities:
accounts = self.m_cliconn.Associators(i.path,
- AssocClass = FmciUserClient.ASSIGNED_IDENTITY_CLASS_NAME)
+ AssocClass = LmiUserClient.ASSIGNED_IDENTITY_CLASS_NAME)
for a in accounts:
members.append(a["Name"])
return members
@@ -94,7 +94,7 @@ class FmciUserClient(FmciBaseClient):
def listGroupMembers(self, member):
(inst_list, errorstr) = self._getInstances(
- FmciUserClient.GROUP_CLASS_NAME, member)
+ LmiUserClient.GROUP_CLASS_NAME, member)
if not inst_list:
return (False, "No such group '%s' found" % member)
members = self.__getGroupMembers(inst_list)
diff --git a/cli-tools/fmci/fmci_options.py b/cli-tools/lmi/lmi_options.py
similarity index 98%
rename from cli-tools/fmci/fmci_options.py
rename to cli-tools/lmi/lmi_options.py
index 14d758a..172a6d0 100644
--- a/cli-tools/fmci/fmci_options.py
+++ b/cli-tools/lmi/lmi_options.py
@@ -16,7 +16,7 @@
import sys
import optparse
-class FmciBasicOptions(object):
+class LmiBasicOptions(object):
def __init__(self, epil = ""):
optparse.OptionParser.format_epilog = lambda self, formatter: self.epilog
self.m_parser = optparse.OptionParser(
diff --git a/cli-tools/lmi/makefile.am b/cli-tools/lmi/makefile.am
new file mode 100644
index 0000000..ecc2e2c
--- /dev/null
+++ b/cli-tools/lmi/makefile.am
@@ -0,0 +1,12 @@
+lmi_PYTHON = \
+ lmi_address.py \
+ lmi_client_base.py \
+ lmi_client_ip.py \
+ lmi_client_power.py \
+ lmi_client_service.py \
+ lmi_client_shell.py \
+ lmi_client_user.py \
+ lmi_options.py \
+ __init__.py
+
+lmidir = $(pythondir)/lmi
diff --git a/cli-tools/makefile.am b/cli-tools/makefile.am
index 1d8f7a0..3d3b7a1 100644
--- a/cli-tools/makefile.am
+++ b/cli-tools/makefile.am
@@ -1,11 +1,11 @@
-SUBDIRS = fmci wsbios
+SUBDIRS = lmi wsbios
bin_SCRIPTS = \
- fmci-ip.py \
- fmci-power.py \
- fmci-service.py \
- fmci-shell.py \
- fmci-user.py
+ lmi-ip.py \
+ lmi-power.py \
+ lmi-service.py \
+ lmi-shell.py \
+ lmi-user.py
EXTRA_DIST = $(bin_SCRIPTS)