diff options
-rw-r--r-- | examples/create_resource.c | 2 | ||||
-rw-r--r-- | examples/enum_epr.c | 2 | ||||
-rw-r--r-- | examples/win32_service.c | 8 | ||||
-rw-r--r-- | src/wsman.c | 24 | ||||
-rw-r--r-- | tests/cunit/enumeration.c | 2 | ||||
-rwxr-xr-x | tests/cunit/invoke.c | 4 | ||||
-rw-r--r-- | tests/cunit/pull.c | 2 | ||||
-rw-r--r-- | tests/cunit/transfer_get.c | 2 | ||||
-rwxr-xr-x | tests/cunit/transfer_put.c | 4 | ||||
-rw-r--r-- | tests/interop/interop.c | 8 |
10 files changed, 29 insertions, 29 deletions
diff --git a/examples/create_resource.c b/examples/create_resource.c index 1662884..337ac0f 100644 --- a/examples/create_resource.c +++ b/examples/create_resource.c @@ -137,7 +137,7 @@ int main(int argc, char** argv) wsman_client_transport_init(cl, NULL); options = wsman_client_options_init(); - if (dump) wsman_set_action_option(options,FLAG_DUMP_REQUEST ); + if (dump) wsman_client_set_action_option(options,FLAG_DUMP_REQUEST ); options->max_envelope_size = 51200; options->timeout = 60000; diff --git a/examples/enum_epr.c b/examples/enum_epr.c index c773f24..c5dd74e 100644 --- a/examples/enum_epr.c +++ b/examples/enum_epr.c @@ -178,7 +178,7 @@ int main(int argc, char** argv) wsman_client_transport_init(cl, NULL); options = wsman_client_options_init(); - wsman_set_action_option(options, FLAG_ENUMERATION_ENUM_EPR); + wsman_client_set_action_option(options, FLAG_ENUMERATION_ENUM_EPR); list_t *l = list_create(LISTCOUNT_T_MAX); diff --git a/examples/win32_service.c b/examples/win32_service.c index 2a87814..8e10c18 100644 --- a/examples/win32_service.c +++ b/examples/win32_service.c @@ -243,24 +243,24 @@ int main(int argc, char** argv) options = wsman_client_options_init(); if (listall) { - if (dump) wsman_set_action_option(options,FLAG_DUMP_REQUEST ); + if (dump) wsman_client_set_action_option(options,FLAG_DUMP_REQUEST ); wsman_client_action_enumerate_and_pull(cl, RESOURCE_URI, options, list_services, NULL ); } else if (start && argv[1]) { - if (dump) wsman_set_action_option(options,FLAG_DUMP_REQUEST ); + if (dump) wsman_client_set_action_option(options,FLAG_DUMP_REQUEST ); wsman_client_add_selector(options, "Name", argv[1]); doc = wsman_client_action_invoke(cl, RESOURCE_URI, options, "StartService", NULL); ws_xml_dump_node_tree(stdout, ws_xml_get_doc_root(doc)); ws_xml_destroy_doc(doc); } else if (stop && argv[1]) { - if (dump) wsman_set_action_option(options,FLAG_DUMP_REQUEST ); + if (dump) wsman_client_set_action_option(options,FLAG_DUMP_REQUEST ); wsman_client_add_selector(options, "Name", argv[1]); doc = wsman_client_action_invoke(cl, RESOURCE_URI, options, "StopService", NULL); ws_xml_dump_node_tree(stdout, ws_xml_get_doc_root(doc)); ws_xml_destroy_doc(doc); } else if ( argv[1] ) { - if (dump) wsman_set_action_option(options,FLAG_DUMP_REQUEST ); + if (dump) wsman_client_set_action_option(options,FLAG_DUMP_REQUEST ); wsman_client_add_selector(options, "Name", argv[1]); doc = wsman_client_action_get(cl, RESOURCE_URI, options); diff --git a/src/wsman.c b/src/wsman.c index ef6abe2..102b608 100644 --- a/src/wsman.c +++ b/src/wsman.c @@ -200,7 +200,7 @@ int main(int argc, char **argv) resource_uri_with_selectors = wsman_options_get_resource_uri(); if (resource_uri_with_selectors && strcmp(resource_uri_with_selectors,CIM_ALL_AVAILABLE_CLASSES) != 0) { - wsman_set_options_from_uri(resource_uri_with_selectors, + wsman_client_set_options_from_uri(resource_uri_with_selectors, options); wsman_remove_query_string(resource_uri_with_selectors, &resource_uri); @@ -211,7 +211,7 @@ int main(int argc, char **argv) op = wsman_options_get_action(); if (wsman_options_get_dump_request()) { - wsman_set_action_option(options, FLAG_DUMP_REQUEST); + wsman_client_set_action_option(options, FLAG_DUMP_REQUEST); } if (wsman_options_get_max_envelope_size()) { options->max_envelope_size = @@ -232,7 +232,7 @@ int main(int argc, char **argv) options->properties = wsman_options_get_properties(); options->cim_ns = wsman_options_get_cim_namespace(); if (wsman_options_get_cim_ext()) { - wsman_set_action_option(options, FLAG_CIM_EXTENSIONS); + wsman_client_set_action_option(options, FLAG_CIM_EXTENSIONS); } @@ -342,45 +342,45 @@ int main(int argc, char **argv) if (enumeration_mode) { if (strcmp(enumeration_mode, "epr") == 0) - wsman_set_action_option(options, + wsman_client_set_action_option(options, FLAG_ENUMERATION_ENUM_EPR); else if (strcmp(enumeration_mode, "objepr") == 0) - wsman_set_action_option(options, + wsman_client_set_action_option(options, FLAG_ENUMERATION_ENUM_OBJ_AND_EPR); } if (binding_enumeration_mode) { if (strcmp(binding_enumeration_mode, "include") == 0) - wsman_set_action_option(options, + wsman_client_set_action_option(options, FLAG_IncludeSubClassProperties); else if (strcmp (binding_enumeration_mode, "exclude") == 0) - wsman_set_action_option(options, + wsman_client_set_action_option(options, FLAG_ExcludeSubClassProperties); else if (strcmp(binding_enumeration_mode, "none") == 0) - wsman_set_action_option(options, + wsman_client_set_action_option(options, FLAG_POLYMORPHISM_NONE); } if (wsman_options_get_cim_ref()) { - wsman_set_action_option(options, + wsman_client_set_action_option(options, FLAG_CIM_REFERENCES); options->dialect = WSM_ASSOCIATION_FILTER_DIALECT; } if (wsman_options_get_cim_assoc()) { - wsman_set_action_option(options, + wsman_client_set_action_option(options, FLAG_CIM_ASSOCIATORS); options->dialect = WSM_ASSOCIATION_FILTER_DIALECT; } if (wsman_options_get_optimize_enum()) { - wsman_set_action_option(options, + wsman_client_set_action_option(options, FLAG_ENUMERATION_OPTIMIZATION); } options->max_elements = wsman_options_get_max_elements(); if (wsman_options_get_estimate_enum()) { - wsman_set_action_option(options, + wsman_client_set_action_option(options, FLAG_ENUMERATION_COUNT_ESTIMATION); } enum_response = wsman_client_action_enumerate(cl, resource_uri, options); diff --git a/tests/cunit/enumeration.c b/tests/cunit/enumeration.c index d689dcd..b0a04c5 100644 --- a/tests/cunit/enumeration.c +++ b/tests/cunit/enumeration.c @@ -272,7 +272,7 @@ static void enumeration_test() { if (tests[i].selectors) { selectors = u_strdup_printf(tests[i].selectors, host, host, host); - wsman_add_selectors_from_query_string(options, selectors); + wsman_client_add_selectors_from_str(options, selectors); } options->max_elements = tests[i].max_elements; diff --git a/tests/cunit/invoke.c b/tests/cunit/invoke.c index 78e13a6..60650f5 100755 --- a/tests/cunit/invoke.c +++ b/tests/cunit/invoke.c @@ -200,10 +200,10 @@ static void invoke_test() { wsman_client_reinit_conn(cl); if (selectors != NULL) { - wsman_add_selectors_from_query_string (options, selectors); + wsman_client_add_selectors_from_str (options, selectors); } if (invoke_tests[i].properties != NULL) { - wsman_add_properties_from_query_string (options, + wsman_client_add_prop_from_str (options, invoke_tests[i].properties); } options->flags = invoke_tests[i].flags; diff --git a/tests/cunit/pull.c b/tests/cunit/pull.c index 71dcb54..6fdd13d 100644 --- a/tests/cunit/pull.c +++ b/tests/cunit/pull.c @@ -165,7 +165,7 @@ static void pull_test() { options->flags = pull_tests[i].flags; if (pull_tests[i].selectors != NULL) - wsman_add_selectors_from_query_string(options, pull_tests[i].selectors); + wsman_client_add_selectors_from_str(options, pull_tests[i].selectors); options->max_elements = pull_tests[i].max_elements; WsXmlDocH enum_response = wsman_client_action_enumerate(cl, diff --git a/tests/cunit/transfer_get.c b/tests/cunit/transfer_get.c index 5a17e3e..539452c 100644 --- a/tests/cunit/transfer_get.c +++ b/tests/cunit/transfer_get.c @@ -175,7 +175,7 @@ static void transfer_get_test() { options = wsman_client_options_init(); if (get_tests[i].selectors != NULL) { - wsman_add_selectors_from_query_string (options, get_tests[i].selectors); + wsman_client_add_selectors_from_str (options, get_tests[i].selectors); } diff --git a/tests/cunit/transfer_put.c b/tests/cunit/transfer_put.c index 9b25a4c..b7c1714 100755 --- a/tests/cunit/transfer_put.c +++ b/tests/cunit/transfer_put.c @@ -184,10 +184,10 @@ static void transfer_put_test() { options = wsman_client_options_init(); if (put_tests[i].selectors != NULL) { - wsman_add_selectors_from_query_string (options, selectors); + wsman_client_add_selectors_from_str (options, selectors); } if (put_tests[i].properties != NULL) { - wsman_add_properties_from_query_string (options, + wsman_client_add_prop_from_str (options, put_tests[i].properties); } options->flags = put_tests[i].flags; diff --git a/tests/interop/interop.c b/tests/interop/interop.c index 5bea1b1..b6bba52 100644 --- a/tests/interop/interop.c +++ b/tests/interop/interop.c @@ -82,7 +82,7 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i { WsXmlDocH response; client_opt_t *options = wsman_client_options_init(); - wsman_set_action_option(options,FLAG_DUMP_REQUEST ); + wsman_client_set_action_option(options,FLAG_DUMP_REQUEST ); if (id == 0) { // 6.1 Identify response = wsman_client_action_identify(cl, options); xml_parser_doc_dump(stdout, response); @@ -126,7 +126,7 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i wsenum_enumerate_and_pull(cl, resource_uri , options, pull_items, NULL ); }else if (id == 9) { // 7.2 Optimized Enumerate - wsman_set_action_option(options, FLAG_ENUMERATION_OPTIMIZATION); + wsman_client_set_action_option(options, FLAG_ENUMERATION_OPTIMIZATION); WsXmlNodeH input = ws_xml_get_child(scenario, 0, NULL, "Input"); WsXmlNodeH r = ws_xml_get_child(input, 0, NULL, "ResourceURI"); char *resource_uri = ws_xml_get_node_text(r); @@ -150,14 +150,14 @@ static int run_interop_test (WsManClient *cl, WsXmlNodeH scenario, InteropTest i }else if (id == 11) { // 7.4 Enumerate ObjectAndEPR - wsman_set_action_option(options, FLAG_ENUMERATION_ENUM_EPR); + wsman_client_set_action_option(options, FLAG_ENUMERATION_ENUM_EPR); WsXmlNodeH input = ws_xml_get_child(scenario, 0, NULL, "Input"); WsXmlNodeH r = ws_xml_get_child(input, 0, NULL, "ResourceURI"); char *resource_uri = ws_xml_get_node_text(r); wsenum_enumerate_and_pull(cl, resource_uri , options, pull_items, NULL ); }else if (id == 16) { // 7.9 Enumerate Polymorphism - wsman_set_action_option(options, FLAG_POLYMORPHISM_NONE); + wsman_client_set_action_option(options, FLAG_POLYMORPHISM_NONE); WsXmlNodeH input = ws_xml_get_child(scenario, 0, NULL, "Input"); WsXmlNodeH r = ws_xml_get_child(input, 0, NULL, "ResourceURI"); char *resource_uri = ws_xml_get_node_text(r); |