You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by nitin-maharana <gi...@git.apache.org> on 2016/01/08 09:25:43 UTC
[GitHub] cloudstack pull request: CLOUDSTACK-8968: UI icon over VM snapshot...
GitHub user nitin-maharana opened a pull request:
https://github.com/apache/cloudstack/pull/1320
CLOUDSTACK-8968: UI icon over VM snapshot to deploy user instance
Added a new Icon in Instance page to launch the VM from the snapshot.
A new icon over VM snapshot object, which upon invoked will open a deploy user instance wizard, where there is no choice to choose zone and ISO or template to deploy the user instance from.
1) A new icon to indicate deploy user instance from VM snapshot
2) The new icon is placed as an operation over each VM snapshot object.
3) Clicking this icon will show the wizard to deploy user instance, which is same as wizard for normal user instance except that zone selection page and ISO/template selection page would not be present in this wizard.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/nitin-maharana/CloudStack CloudStack-Nitin12_4.7
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1320.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1320
----
commit 55183fd81804e41f9fa8e335a3282ef42e536af7
Author: Nitin Kumar Maharana <ni...@gmail.com>
Date: 2015-12-07T18:14:37Z
CLOUDSTACK-8968: UI icon over VM snapshot to deploy user instance
Added a new Icon in Instance page to launch the VM from the snapshot.
Only supports in case of VMware.
Conflicts:
client/WEB-INF/classes/resources/messages.properties
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request #1320: CLOUDSTACK-8968: UI icon over VM snapshot to ...
Posted by nitin-maharana <gi...@git.apache.org>.
Github user nitin-maharana closed the pull request at:
https://github.com/apache/cloudstack/pull/1320
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1320: CLOUDSTACK-8968: UI icon over VM snapshot to deploy ...
Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the issue:
https://github.com/apache/cloudstack/pull/1320
@nitin-maharana can you rebase and change PR base to 4.8+ branches. Thanks.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1320: CLOUDSTACK-8968: UI icon over VM snapshot to deploy ...
Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the issue:
https://github.com/apache/cloudstack/pull/1320
@nitin-maharana yes, the master branch is JSP free now. The UI is purely JS/html/css based.
Yes, you'll need to add new keys only to the l10n (localisation) specific files and use them in the UI/JS code.
This also fixes the issue of adding the same set of keys to messages.properties file and then the dictionary/jsp files. The workflow is much easier now.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8968: UI icon over VM snapshot...
Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the pull request:
https://github.com/apache/cloudstack/pull/1320#issuecomment-216220179
@nitin-maharana please rebase and share screenshots of what this fixes
A manual UI testing would be needed
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1320: CLOUDSTACK-8968: UI icon over VM snapshot to deploy ...
Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the issue:
https://github.com/apache/cloudstack/pull/1320
Thanks @nitin-maharana
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1320: CLOUDSTACK-8968: UI icon over VM snapshot to deploy ...
Posted by nitin-maharana <gi...@git.apache.org>.
Github user nitin-maharana commented on the issue:
https://github.com/apache/cloudstack/pull/1320
This change will come with #1664. Hence closing this.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8968: UI icon over VM snapshot...
Posted by rodrigo93 <gi...@git.apache.org>.
Github user rodrigo93 commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1320#discussion_r52106924
--- Diff: ui/scripts/instanceWizard.js ---
@@ -294,53 +295,67 @@
// Step 3: Service offering
function(args) {
- selectedTemplateObj = null; //reset
- if (args.currentData["select-template"] == "select-template") {
- if (featuredTemplateObjs != null && featuredTemplateObjs.length > 0) {
- for (var i = 0; i < featuredTemplateObjs.length; i++) {
- if (featuredTemplateObjs[i].id == args.currentData.templateid) {
- selectedTemplateObj = featuredTemplateObjs[i];
- break;
+ snapshotObjs = null;
+ selectedSnapshotObj = null;
+
+ if (args.moreArgs && args.moreArgs.snapshot)
+ {
+ zoneObjs = args.moreArgs.zone;
+ selectedZoneObj = zoneObjs[0];
+ hypervisorObjs = args.moreArgs.hypervisor;
+ selectedHypervisor = hypervisorObjs[0].name;
+ snapshotObjs = args.moreArgs.snapshot;
+ selectedSnapshotObj = snapshotObjs[0];
+ }
+ else {
+ selectedTemplateObj = null; //reset
+ if (args.currentData["select-template"] == "select-template") {
+ if (featuredTemplateObjs != null && featuredTemplateObjs.length > 0) {
+ for (var i = 0; i < featuredTemplateObjs.length; i++) {
+ if (featuredTemplateObjs[i].id == args.currentData.templateid) {
+ selectedTemplateObj = featuredTemplateObjs[i];
+ break;
+ }
}
}
- }
- if (selectedTemplateObj == null) {
- if (communityTemplateObjs != null && communityTemplateObjs.length > 0) {
- for (var i = 0; i < communityTemplateObjs.length; i++) {
- if (communityTemplateObjs[i].id == args.currentData.templateid) {
- selectedTemplateObj = communityTemplateObjs[i];
- break;
+ if (selectedTemplateObj == null) {
--- End diff --
Hi @nitin-maharana
Couldn't this _if_ and the following _ifs_ be merged into one?
Like:
> if ( selectedTemplateObj == null && communityTemplateObjs != null && communityTemplateObjs.length > 0)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1320: CLOUDSTACK-8968: UI icon over VM snapshot to deploy ...
Posted by nitin-maharana <gi...@git.apache.org>.
Github user nitin-maharana commented on the issue:
https://github.com/apache/cloudstack/pull/1320
@rhtyd: This is dependent on #1664, Once #1664 gets merged, I will make a new PR.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8968: UI icon over VM snapshot...
Posted by nitin-maharana <gi...@git.apache.org>.
Github user nitin-maharana commented on the pull request:
https://github.com/apache/cloudstack/pull/1320#issuecomment-169931271
Reference PR #1150 (Against 4.6). This PR (against 4.7) contains the same code change with one conflict which I resolved.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1320: CLOUDSTACK-8968: UI icon over VM snapshot to deploy ...
Posted by nitin-maharana <gi...@git.apache.org>.
Github user nitin-maharana commented on the issue:
https://github.com/apache/cloudstack/pull/1320
@rhtyd : I discussed with @sateesh-chodapuneedi regarding this. I will give my changes to him. He will include my commit in his PR. Thanks.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1320: CLOUDSTACK-8968: UI icon over VM snapshot to deploy ...
Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the issue:
https://github.com/apache/cloudstack/pull/1320
@nitin-maharana the feature is related, and exclusive; in that case please move your changes to PR #1664
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8968: UI icon over VM snapshot...
Posted by swill <gi...@git.apache.org>.
Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1320#issuecomment-215554347
@nitin-maharana please rebase as we currently have merge conflicts. Thanks...
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1320: CLOUDSTACK-8968: UI icon over VM snapshot to deploy ...
Posted by nitin-maharana <gi...@git.apache.org>.
Github user nitin-maharana commented on the issue:
https://github.com/apache/cloudstack/pull/1320
Hi @rhtyd, I observed there is a change in the way we were maintaining the dictionary. The messages*.properties and dictioanry*.jsp file was removed and the content was moved to the l10n folder. How the change in l10n files reflect in the browser. Do we need to modify any other file to reflect the change?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---