Advertisement
Guest User

Untitled

a guest
Feb 15th, 2017
159
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.84 KB | None | 0 0
  1. 13c13
  2. < BUILD_DATE="(built Wed Nov 23 10:34:18 EST 2016)"
  3. ---
  4. > BUILD_DATE="(built Tue Apr 5 10:01:12 EDT 2016)"
  5. 69,70c69
  6. <           status = RE_STATUS.search(lines[i]).group(1)
  7. <           outlets[name] = ("", status)
  8. ---
  9. >           outlets[name] = ("", None)
  10. 84,87d82
  11. <   if opt.has_key("--api-path"):
  12. <       api_path = opt["--api-path"]
  13. <   else:
  14. <       api_path = "/ovirt-engine/api"
  15. 89c84
  16. <   url += "//" + opt["--ip"] + ":" + str(opt["--ipport"]) + api_path + "/" + command
  17. ---
  18. >   url += "//" + opt["--ip"] + ":" + str(opt["--ipport"]) + "/api/" + command
  19. 95,101c90
  20. <   conn.setopt(pycurl.HTTPHEADER, [
  21. <       "Version: 3",
  22. <       "Content-type: application/xml",
  23. <       "Accept: application/xml",
  24. <       "Prefer: persistent-auth",
  25. <       "Filter: true",
  26. <   ])
  27. ---
  28. >   conn.setopt(pycurl.HTTPHEADER, ["Content-type: application/xml", "Accept: application/xml", "Prefer: persistent-auth"])
  29. 149,156d137
  30. <   all_opt["api_path"] = {
  31. <       "getopt" : ":",
  32. <       "longopt" : "api-path",
  33. <       "help" : "--api-path=[path]              The path of the API URL",
  34. <       "default" : "/ovirt-engine/api",
  35. <       "required" : "0",
  36. <       "shortdesc" : "The path of the API URL",
  37. <       "order" : 2}
  38. 159,169c140
  39. <   device_opt = [
  40. <       "ipaddr",
  41. <       "api_path",
  42. <       "login",
  43. <       "passwd",
  44. <       "ssl",
  45. <       "notls",
  46. <       "web",
  47. <       "port",
  48. <       "use_cookies",
  49. <   ]
  50. ---
  51. >   device_opt = ["ipaddr", "login", "passwd", "ssl", "notls", "web", "port", "use_cookies" ]
  52. [root@eduliberty ~]# diff new old
  53. 13c13
  54. < BUILD_DATE="(built Wed Nov 23 10:34:18 EST 2016)"
  55. ---
  56. > BUILD_DATE="(built Tue Apr 5 10:01:12 EDT 2016)"
  57. 69,70c69
  58. <           status = RE_STATUS.search(lines[i]).group(1)
  59. <           outlets[name] = ("", status)
  60. ---
  61. >           outlets[name] = ("", None)
  62. 84,87d82
  63. <   if opt.has_key("--api-path"):
  64. <       api_path = opt["--api-path"]
  65. <   else:
  66. <       api_path = "/ovirt-engine/api"
  67. 89c84
  68. <   url += "//" + opt["--ip"] + ":" + str(opt["--ipport"]) + api_path + "/" + command
  69. ---
  70. >   url += "//" + opt["--ip"] + ":" + str(opt["--ipport"]) + "/api/" + command
  71. 95,101c90
  72. <   conn.setopt(pycurl.HTTPHEADER, [
  73. <       "Version: 3",
  74. <       "Content-type: application/xml",
  75. <       "Accept: application/xml",
  76. <       "Prefer: persistent-auth",
  77. <       "Filter: true",
  78. <   ])
  79. ---
  80. >   conn.setopt(pycurl.HTTPHEADER, ["Content-type: application/xml", "Accept: application/xml", "Prefer: persistent-auth"])
  81. 149,156d137
  82. <   all_opt["api_path"] = {
  83. <       "getopt" : ":",
  84. <       "longopt" : "api-path",
  85. <       "help" : "--api-path=[path]              The path of the API URL",
  86. <       "default" : "/ovirt-engine/api",
  87. <       "required" : "0",
  88. <       "shortdesc" : "The path of the API URL",
  89. <       "order" : 2}
  90. 159,169c140
  91. <   device_opt = [
  92. <       "ipaddr",
  93. <       "api_path",
  94. <       "login",
  95. <       "passwd",
  96. <       "ssl",
  97. <       "notls",
  98. <       "web",
  99. <       "port",
  100. <       "use_cookies",
  101. <   ]
  102. ---
  103. >   device_opt = ["ipaddr", "login", "passwd", "ssl", "notls", "web", "port", "use_cookies" ]
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement