8000 Try to make install work on old cluster by jsancio · Pull Request #1025 · dcos/dcos-cli · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Try to make install work on old cluster #1025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 8, 2017
Merged

Try to make install work on old cluster #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cc3c8d
Try to make install work on old cluster
jsancio Aug 7, 2017
bc2588a
Merge remote-tracking branch 'origin/master' into universal-install
jsancio Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dcos/cosmos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def _data(versions, http_method):
self._endpoint_data = {
'capabilities': _data(['v1'], 'get'),
'package/add': _data(['v1'], 'post'),
'package/describe': _data(['v3'], 'post'),
'package/describe': _data(['v3', 'v2'], 'post'),
'package/install': _data(['v2'], 'post'),
'package/list': _data(['v1'], 'post'),
'package/list-versions': _data(['v1'], 'post'),
Expand Down
18 changes: 11 additions & 7 deletions dcos/packagemanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ def __init__(self, name, package_version, url):
response = PackageManager(url).cosmos_post("describe", params)

self._package_json = response.json()
self._content_type = response.headers['content-type']

def version(self):
"""Returns the package version.
Expand All @@ -367,7 +368,7 @@ def version(self):
:rtype: str
"""

return self._package_json["package"]["version"]
return self.package_json()["version"]

def name(self):
"""Returns the package name.
Expand All @@ -376,7 +377,7 @@ def name(self):
:rtype: str
"""

return self._package_json["package"]["name"]
return self.package_json()["name"]

def package_json(self):
"""Returns the JSON content of the package definition.
Expand All @@ -385,7 +386,10 @@ def package_json(self):
:rtype: dict
"""

return self._package_json["package"]
if 'version=v2' in self._content_type:
return self._package_json
else:
return self._package_json["package"]

def package_response(self):
"""Returns the JSON content of the describe response.
Expand All @@ -403,7 +407,7 @@ def config_json(self):
:rtype: dict | None
"""

return self._package_json["package"].get("config")
return self.package_json().get("config")

def resource_json(self):
"""Returns the JSON content of the resource.json file.
Expand All @@ -412,7 +416,7 @@ def resource_json(self):
:rtype: dict | None
"""

return self._package_json["package"].get("resource")
return self.package_json().get("resource")

def marathon_template(self):
"""Returns raw data from marathon.json
Expand All @@ -421,7 +425,7 @@ def marathon_template(self):
:rtype: str | None
"""

template = self._package_json["package"].get("marathon", {}).get(
template = self.package_json().get("marathon", {}).get(
"v2AppMustacheTemplate"
)

Expand Down Expand Up @@ -478,7 +482,7 @@ def command_json(self):
:rtype: dict | None
"""

return self._package_json["package"].get("command")
return self.package_json().get("command")

def package_versions(self):
"""Returns a list of available versions for this package
Expand Down
0