-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bring up-to-date with Andy's comments and clean up code for all
of the log configure methods. This also cleans up the logging docstring in _logging.py This incorporates Andy's comments that I marked as DONE. Note that some of the comments will be reflected in the redesign we agreed on 27 Feb Change pywbem.ops to pywbem.api in log name per discussion 27 Feb. Changes for new log config methods in cim_operations a. Remove the functions from logger except for the configure...from_string b. Add the methods to WBEMConnection for configure_api_logger, configure_http_logger and configue_all_loggers as class methods c. Remove the enable_log attribute from WBEMConnection d. Modify the recorder to handle the new detail_level options. e. Redo many of the tests in both test_logging.py and test_recorder.py Cleaned up the new methods in cim_operations and created a set of internal methods since the work is largely common. Added code so that the class methods can also control the activation of logging. Tested with wbemcli and cleaned up the output loggers. In particular changed the paths logger so that it actually shows the string definition of paths. Removed parameter stream in logging.streamhandler() We had to remove this because apparently not supported in python 2.6
- Loading branch information
1 parent
a769404
commit d1b9873
Showing
10 changed files
with
1,096 additions
and
692 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,89 +0,0 @@ | ||
usage: mof_compiler [options] moffile ... | ||
|
||
Compile MOF files, and update a namespace in a WBEM server with the result. | ||
|
||
Positional arguments: | ||
moffile Path name of the MOF file to be compiled. | ||
Can be specified multiple times. | ||
|
||
Server related options: | ||
Specify the WBEM server and namespace the MOF compiler works against, for | ||
looking up existing elements, and for applying the MOF compilation results | ||
to. | ||
|
||
-s url, --server url Host name or URL of the WBEM server (required), | ||
in this format: | ||
[scheme://]host[:port] | ||
- scheme: Defines the protocol to use: | ||
- "https" for HTTPS protocol | ||
- "http" for HTTP protocol | ||
Default: "https". | ||
- host: Defines host name as follows: | ||
- short or fully qualified DNS hostname | ||
- literal IPV4 address(dotted) | ||
- literal IPV6 address (RFC 3986) with zone | ||
identifier extensions(RFC 6874) | ||
supporting "-" or %25 for the delimiter | ||
- port: Defines the WBEM server port to be used. | ||
Defaults: | ||
- 5988, when using HTTP | ||
- 5989, whenusing HTTPS | ||
-n namespace, --namespace namespace | ||
Namespace in the WBEM server. | ||
Default: root/cimv2 | ||
|
||
Connection security related options: | ||
Specify user name and password or certificates and keys | ||
|
||
-u user, --user user User name for authenticating with the WBEM server. | ||
Default: No user name. | ||
-p password, --password password | ||
Password for authenticating with the WBEM server. | ||
Default: Will be prompted for, if user name | ||
specified. | ||
-nvc, --no-verify-cert | ||
Client will not verify certificate returned by the | ||
WBEM server (see cacerts). This bypasses the client- | ||
side verification of the server identity, but allows | ||
encrypted communication with a server for which the | ||
client does not have certificates. | ||
--cacerts cacerts File or directory containing certificates that will be | ||
matched against a certificate received from the WBEM | ||
server. Set the --no-verify-cert option to bypass | ||
client verification of the WBEM server certificate. | ||
Default: Searches for matching certificates in the | ||
following system directories: | ||
/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt | ||
/etc/ssl/certs | ||
/etc/ssl/certificates | ||
--certfile certfile Client certificate file for authenticating with the | ||
WBEM server. If option specified the client attempts | ||
to execute mutual authentication. | ||
Default: Simple authentication. | ||
--keyfile keyfile Client private key file for authenticating with the | ||
WBEM server. Not required if private key is part of the | ||
certfile option. Not allowed if no certfile option. | ||
Default: No client key file. Client private key should | ||
then be part of the certfile | ||
|
||
Action related options: | ||
Specify actions against the WBEM server's namespace. Default: | ||
Create/update elements. | ||
|
||
-r, --remove Remove elements (found in the MOF files) from the WBEM | ||
server's namespace, instead of creating or updating | ||
them | ||
-d, --dry-run Don't actually modify the WBEM server's namespace, | ||
just check MOF syntax. Connection to WBEM server is | ||
still required to check qualifiers. | ||
|
||
General options: | ||
-I dir, --include dir | ||
Path name of a MOF include directory. Can be specified | ||
multiple times. | ||
-v, --verbose Print more messages while processing | ||
-V, --version Display pywbem version and exit. | ||
-h, --help Show this help message and exit | ||
|
||
Example: mof_compiler CIM_Schema_2.45.mof -s https://localhost -n root/cimv2 | ||
-u sheldon -p p42 | ||
Oops, something went wrong.