Skip to content
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

[WIP] Refactored cloudstackversion with backwardcompat #830

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Refactored cloudstackversion with backwardcompat #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions cosmic-client/src/main/webapp/scripts/cloudStack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
g_allowUserExpungeRecoverVm = json.listcapabilitiesresponse.capability.allowuserexpungerecovervm;
g_userProjectsEnabled = json.listcapabilitiesresponse.capability.allowusercreateprojects;

g_cloudstackversion = json.listcapabilitiesresponse.capability.cloudstackversion;
g_cosmicversion = json.listcapabilitiesresponse.capability.cosmicversion;

if (json.listcapabilitiesresponse.capability.apilimitinterval != null && json.listcapabilitiesresponse.capability.apilimitmax != null) {
var intervalLimit = ((json.listcapabilitiesresponse.capability.apilimitinterval * 1000) / json.listcapabilitiesresponse.capability.apilimitmax) * 3; //multiply 3 to be on safe side
Expand Down Expand Up @@ -266,7 +266,7 @@
g_allowUserExpungeRecoverVm = json.listcapabilitiesresponse.capability.allowuserexpungerecovervm;
g_userProjectsEnabled = json.listcapabilitiesresponse.capability.allowusercreateprojects;

g_cloudstackversion = json.listcapabilitiesresponse.capability.cloudstackversion;
g_cosmicversion = json.listcapabilitiesresponse.capability.cosmicversion;

if (json.listcapabilitiesresponse.capability.apilimitinterval != null && json.listcapabilitiesresponse.capability.apilimitmax != null) {
var intervalLimit = ((json.listcapabilitiesresponse.capability.apilimitinterval * 1000) / json.listcapabilitiesresponse.capability.apilimitmax) * 3; //multiply 3 to be on safe side
Expand Down Expand Up @@ -348,7 +348,7 @@
});
},

// Show cloudStack main UI widget
// Show cosmic main UI widget
complete: function (args) {
var context = {
users: [args.user]
Expand Down
2 changes: 1 addition & 1 deletion cosmic-client/src/main/webapp/scripts/sharedFunctions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var g_kvmsnapshotenabled = null;
var g_regionsecondaryenabled = null;
var g_userPublicTemplateEnabled = "true";
var g_allowUserExpungeRecoverVm = "false";
var g_cloudstackversion = null;
var g_cosmicversion = null;
var g_queryAsyncJobResultInterval = 3000;
var g_idpList = null;
var g_appendIdpDomain = false;
Expand Down
2 changes: 1 addition & 1 deletion cosmic-client/src/main/webapp/scripts/ui/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
if (this == 'label.about.app') {
$link.addClass('about').click(function () {
var $logo = $('<div>').addClass('logo').text(_l('label.app.name')),
$version = $('<div>').addClass('version').text(g_cloudstackversion),
$version = $('<div>').addClass('version').text(g_cosmicversion),
$about = $('<div>').addClass('about').append($logo).append($version);
$about.dialog({
modal: true,
Expand Down
2 changes: 1 addition & 1 deletion cosmic-core/api/src/main/java/com/cloud/api/command/user/config/ListCapabilitiesCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class ListCapabilitiesCmd extends BaseCmd {
public void execute() {
final Map<String, Object> capabilities = _mgr.listCapabilities(this);
final CapabilitiesResponse response = new CapabilitiesResponse();
response.setCloudStackVersion((String) capabilities.get("cloudStackVersion"));
response.setCosmicVersion((String) capabilities.get("cosmicVersion"));
response.setCosmic((Boolean) true);
response.setUserPublicTemplateEnabled((Boolean) capabilities.get("userPublicTemplateEnabled"));
response.setSupportELB((String) capabilities.get("supportELB"));
Expand Down
9 changes: 7 additions & 2 deletions cosmic-core/api/src/main/java/com/cloud/api/response/CapabilitiesResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ public class CapabilitiesResponse extends BaseResponse {
@Param(description = "version of the cloud stack")
private String cloudStackVersion;

@SerializedName("cosmicversion")
@Param(description = "version of cosmic")
private String cosmicVersion;

@SerializedName("cosmic")
@Param(description = "Cosmic or not")
private Boolean cosmic;
Expand Down Expand Up @@ -79,8 +83,9 @@ public void setKvmDeploymentsEnabled(final boolean kvmDeploymentsEnabled) {
this.kvmDeploymentsEnabled = kvmDeploymentsEnabled;
}

public void setCloudStackVersion(final String cloudStackVersion) {
this.cloudStackVersion = cloudStackVersion;
public void setCosmicVersion(final String cosmicVersion) {
this.cloudStackVersion = cosmicVersion;
this.cosmicVersion = cosmicVersion;
}

public void setCosmic(final Boolean cosmic) {
Expand Down
2 changes: 1 addition & 1 deletion cosmic-core/server/src/main/java/com/cloud/server/ManagementServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2349,7 +2349,7 @@ public Map<String, Object> listCapabilities(final ListCapabilitiesCmd cmd) {
}

capabilities.put("userPublicTemplateEnabled", userPublicTemplateEnabled);
capabilities.put("cloudStackVersion", getVersion());
capabilities.put("cosmicVersion", getVersion());
capabilities.put("supportELB", supportELB);
capabilities.put("projectInviteRequired", _projectMgr.projectInviteRequired());
capabilities.put("allowusercreateprojects", _projectMgr.allowUserToCreateProject());
Expand Down