diff options
| author | Matt Clay <matt@mystile.com> | 2016-08-05 11:28:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 11:28:02 -0700 |
| commit | 33716b18374059b18c08a8724b684ca48db3c41c (patch) | |
| tree | 0e1597ba572a5164d913d7d560dedb5d4f17aaf2 /monitoring | |
| parent | d4b0732c9fe61b55d607d06f190a9d8663225cc4 (diff) | |
| download | ansible-modules-extras-33716b18374059b18c08a8724b684ca48db3c41c.tar.gz | |
Use open_url directly to avoid failing tests. (#2680)
Diffstat (limited to 'monitoring')
| -rw-r--r-- | monitoring/logicmonitor.py | 5 | ||||
| -rw-r--r-- | monitoring/logicmonitor_facts.py | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/monitoring/logicmonitor.py b/monitoring/logicmonitor.py index be016327..8d35f3bf 100644 --- a/monitoring/logicmonitor.py +++ b/monitoring/logicmonitor.py @@ -550,7 +550,6 @@ class LogicMonitor(object): self.password = params["password"] self.fqdn = socket.getfqdn() self.lm_url = "logicmonitor.com/santaba" - self.urlopen = open_url # use the ansible provided open_url self.__version__ = self.__version__ + "-ansible-module" def rpc(self, action, params): @@ -577,7 +576,7 @@ class LogicMonitor(object): headers = {"X-LM-User-Agent": self.__version__} # Set headers - f = self.urlopen(url, headers=headers) + f = open_url(url, headers=headers) raw = f.read() resp = json.loads(raw) @@ -608,7 +607,7 @@ class LogicMonitor(object): self.module.debug("Attempting to open URL: " + "https://" + self.company + "." + self.lm_url + "/do/" + action + "?" + param_str) - f = self.urlopen( + f = open_url( "https://" + self.company + "." + self.lm_url + "/do/" + action + "?" + param_str) return f.read() diff --git a/monitoring/logicmonitor_facts.py b/monitoring/logicmonitor_facts.py index 7e9bf00c..cc91ca61 100644 --- a/monitoring/logicmonitor_facts.py +++ b/monitoring/logicmonitor_facts.py @@ -200,7 +200,6 @@ class LogicMonitor(object): self.password = params["password"] self.fqdn = socket.getfqdn() self.lm_url = "logicmonitor.com/santaba" - self.urlopen = open_url # use the ansible provided open_url self.__version__ = self.__version__ + "-ansible-module" def rpc(self, action, params): @@ -227,7 +226,7 @@ class LogicMonitor(object): headers = {"X-LM-User-Agent": self.__version__} # Set headers - f = self.urlopen(url, headers=headers) + f = open_url(url, headers=headers) raw = f.read() resp = json.loads(raw) |