You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2014/07/01 11:39:58 UTC
[1/4] git commit: updated refs/heads/4.3 to ba9ae0c
Repository: cloudstack
Updated Branches:
refs/heads/4.3 51f145b56 -> ba9ae0c66
[UI] show isVolatile explanation text
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11f5f926
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11f5f926
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11f5f926
Branch: refs/heads/4.3
Commit: 11f5f926b9e2956a8269bf857832cd7659ee3183
Parents: 51f145b
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Jul 1 10:54:31 2014 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Jul 1 11:39:21 2014 +0200
----------------------------------------------------------------------
ui/scripts/configuration.js | 4 ++--
ui/scripts/docs.js | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f5f926/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index e52f519..a4887be 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -199,8 +199,8 @@
isVolatile: {
label: 'label.volatile',
isBoolean: true,
- isChecked: false
-
+ isChecked: false,
+ docID: 'helpComputeOfferingIsVolatile'
},
deploymentPlanner: {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f5f926/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 2e451fd..014bcb4 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -273,6 +273,9 @@ cloudStack.docs = {
helpComputeOfferingDomain: {
desc: 'The domain to associate this compute offering with'
},
+ helpComputeOfferingIsVolatile: {
+ desc: 'If checked, VMs created from this service offering will have their root disks reset upon reboot. This is useful for secure environments that need a fresh start on every boot and for desktops that should not retain state.'
+ },
// Add disk offering
helpDiskOfferingName: {
desc: 'Any desired name for the offering',
[2/4] git commit: updated refs/heads/4.3 to ba9ae0c
Posted by we...@apache.org.
[UI] filter out already connected networks when add network to vm
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6fd419ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6fd419ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6fd419ad
Branch: refs/heads/4.3
Commit: 6fd419ad9d589da7930b9c593eb8ad81c989ebe7
Parents: 11f5f92
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Jul 1 10:54:57 2014 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Jul 1 11:39:25 2014 +0200
----------------------------------------------------------------------
ui/scripts/instances.js | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fd419ad/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index d45b6cb..8a13ef2 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1906,13 +1906,30 @@
domainid: args.context.instances[0].domainid
},
success: function(json) {
+ var networkObjs = json.listnetworksresponse.network;
+ var nicObjs = args.context.instances[0].nic;
+ var items = [];
+
+ for (var i = 0; i < networkObjs.length; i++) {
+ var networkObj = networkObjs[i];
+ var isNetworkExists = false;
+
+ for (var j = 0; j < nicObjs.length; j++) {
+ if (nicObjs[j].networkid == networkObj.id) {
+ isNetworkExists = true;
+ break;
+ }
+ }
+
+ if (!isNetworkExists) {
+ items.push({
+ id: networkObj.id,
+ description: networkObj.name
+ });
+ }
+ }
args.response.success({
- data: $.map(json.listnetworksresponse.network, function(network) {
- return {
- id: network.id,
- description: network.name
- };
- })
+ data: items
});
}
});
[4/4] git commit: updated refs/heads/4.3 to ba9ae0c
Posted by we...@apache.org.
[UI] add view instances in template/iso details page
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba9ae0c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba9ae0c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba9ae0c6
Branch: refs/heads/4.3
Commit: ba9ae0c6636e30a9a9629851fafa14349897fcbf
Parents: 39cc82d
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Jul 1 10:55:46 2014 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Jul 1 11:39:38 2014 +0200
----------------------------------------------------------------------
.../apache/cloudstack/api/response/IsoVmResponse.java | 4 ++++
ui/scripts/instances.js | 12 ++++++++++++
ui/scripts/templates.js | 8 ++++++++
3 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba9ae0c6/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
index 14803d5..170ba90 100644
--- a/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/IsoVmResponse.java
@@ -17,10 +17,14 @@
package org.apache.cloudstack.api.response;
import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.EntityReference;
import com.cloud.serializer.Param;
+import com.cloud.template.VirtualMachineTemplate;
import com.google.gson.annotations.SerializedName;
+@EntityReference(value=VirtualMachineTemplate.class)
+@SuppressWarnings("unused")
public class IsoVmResponse extends BaseResponse {
@SerializedName("id") @Param(description="the ISO ID")
private String id;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba9ae0c6/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 591cf4c..896b535 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -327,6 +327,18 @@
});
}
+ if ("templates" in args.context) {
+ $.extend(data, {
+ templateid: args.context.templates[0].id
+ });
+ }
+
+ if ("isos" in args.context) {
+ $.extend(data, {
+ isoid: args.context.isos[0].id
+ });
+ }
+
$.ajax({
url: createURL('listVirtualMachines'),
data: data,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba9ae0c6/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 49817b1..379c69b 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -593,6 +593,10 @@
detailView: {
name: 'Template details',
+ viewAll: {
+ label: 'label.instances',
+ path: 'instances'
+ },
actions: {
edit: {
label: 'label.edit',
@@ -1421,6 +1425,10 @@
detailView: {
name: 'label.details',
+ viewAll: {
+ label: 'label.instances',
+ path: 'instances'
+ },
actions: {
edit: {
label: 'label.edit',
[3/4] git commit: updated refs/heads/4.3 to ba9ae0c
Posted by we...@apache.org.
[UI] hide listHosts for stopped vm
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/39cc82db
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/39cc82db
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/39cc82db
Branch: refs/heads/4.3
Commit: 39cc82dbe85e7aae1677271e82e4224f42d305bd
Parents: 6fd419a
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Jul 1 10:55:13 2014 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Jul 1 11:39:30 2014 +0200
----------------------------------------------------------------------
ui/scripts/instances.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/39cc82db/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 8a13ef2..591cf4c 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -354,7 +354,7 @@
path: '_zone.hosts',
label: 'label.hosts',
preFilter: function(args) {
- return isAdmin();
+ return (isAdmin() && (args.context.instances[0].hostid != null));
},
updateContext: function(args) {
var instance = args.context.instances[0];