Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- 13c13
- < BUILD_DATE="(built Wed Nov 23 10:34:18 EST 2016)"
- ---
- > BUILD_DATE="(built Tue Apr 5 10:01:12 EDT 2016)"
- 69,70c69
- < status = RE_STATUS.search(lines[i]).group(1)
- < outlets[name] = ("", status)
- ---
- > outlets[name] = ("", None)
- 84,87d82
- < if opt.has_key("--api-path"):
- < api_path = opt["--api-path"]
- < else:
- < api_path = "/ovirt-engine/api"
- 89c84
- < url += "//" + opt["--ip"] + ":" + str(opt["--ipport"]) + api_path + "/" + command
- ---
- > url += "//" + opt["--ip"] + ":" + str(opt["--ipport"]) + "/api/" + command
- 95,101c90
- < conn.setopt(pycurl.HTTPHEADER, [
- < "Version: 3",
- < "Content-type: application/xml",
- < "Accept: application/xml",
- < "Prefer: persistent-auth",
- < "Filter: true",
- < ])
- ---
- > conn.setopt(pycurl.HTTPHEADER, ["Content-type: application/xml", "Accept: application/xml", "Prefer: persistent-auth"])
- 149,156d137
- < all_opt["api_path"] = {
- < "getopt" : ":",
- < "longopt" : "api-path",
- < "help" : "--api-path=[path] The path of the API URL",
- < "default" : "/ovirt-engine/api",
- < "required" : "0",
- < "shortdesc" : "The path of the API URL",
- < "order" : 2}
- 159,169c140
- < device_opt = [
- < "ipaddr",
- < "api_path",
- < "login",
- < "passwd",
- < "ssl",
- < "notls",
- < "web",
- < "port",
- < "use_cookies",
- < ]
- ---
- > device_opt = ["ipaddr", "login", "passwd", "ssl", "notls", "web", "port", "use_cookies" ]
- [root@eduliberty ~]# diff new old
- 13c13
- < BUILD_DATE="(built Wed Nov 23 10:34:18 EST 2016)"
- ---
- > BUILD_DATE="(built Tue Apr 5 10:01:12 EDT 2016)"
- 69,70c69
- < status = RE_STATUS.search(lines[i]).group(1)
- < outlets[name] = ("", status)
- ---
- > outlets[name] = ("", None)
- 84,87d82
- < if opt.has_key("--api-path"):
- < api_path = opt["--api-path"]
- < else:
- < api_path = "/ovirt-engine/api"
- 89c84
- < url += "//" + opt["--ip"] + ":" + str(opt["--ipport"]) + api_path + "/" + command
- ---
- > url += "//" + opt["--ip"] + ":" + str(opt["--ipport"]) + "/api/" + command
- 95,101c90
- < conn.setopt(pycurl.HTTPHEADER, [
- < "Version: 3",
- < "Content-type: application/xml",
- < "Accept: application/xml",
- < "Prefer: persistent-auth",
- < "Filter: true",
- < ])
- ---
- > conn.setopt(pycurl.HTTPHEADER, ["Content-type: application/xml", "Accept: application/xml", "Prefer: persistent-auth"])
- 149,156d137
- < all_opt["api_path"] = {
- < "getopt" : ":",
- < "longopt" : "api-path",
- < "help" : "--api-path=[path] The path of the API URL",
- < "default" : "/ovirt-engine/api",
- < "required" : "0",
- < "shortdesc" : "The path of the API URL",
- < "order" : 2}
- 159,169c140
- < device_opt = [
- < "ipaddr",
- < "api_path",
- < "login",
- < "passwd",
- < "ssl",
- < "notls",
- < "web",
- < "port",
- < "use_cookies",
- < ]
- ---
- > device_opt = ["ipaddr", "login", "passwd", "ssl", "notls", "web", "port", "use_cookies" ]
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement