Merge pull request #1767 from nvazquez/userVmAndTemplatesDetails CLOUDSTACK-9457: Allow retrieval and modification of VM and template details via API and UIJIRA TICKET: https://issues.apache.org/jira/browse/CLOUDSTACK-9457
### Goal This PR proposes list/add/update/delete user vm and vm template details via API and UI. ### VM UI Screenshots Setting tab is added on Instances page. Actions allowed are: Add/Edit/Remove  Settings tab is only shown if instance is Stopped:   ### Templates UI Screenshots Setting tab is added on Templates page. Actions allowed are: Add/Edit/Remove:  * pr/1767: CLOUDSTACK-9457: Allow retrieval and modification of VM and template details via API and UI Signed-off-by: Rajani Karuturi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/202b92f2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/202b92f2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/202b92f2 Branch: refs/heads/master Commit: 202b92f2437ea0ebd575998bf7adc7d54aeb762e Parents: 30aef28 e8049af Author: Rajani Karuturi <[email protected]> Authored: Wed Feb 8 12:12:36 2017 +0530 Committer: Rajani Karuturi <[email protected]> Committed: Wed Feb 8 12:12:37 2017 +0530 ---------------------------------------------------------------------- .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../api/BaseUpdateTemplateOrIsoCmd.java | 12 +- .../api/command/user/vm/UpdateVMCmd.java | 9 + .../com/cloud/storage/VMTemplateDetailVO.java | 16 ++ .../schema/src/com/cloud/vm/UserVmDetailVO.java | 7 + .../cloud/api/query/dao/UserVmJoinDaoImpl.java | 11 +- .../com/cloud/template/TemplateManagerImpl.java | 13 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 14 +- .../cloud/template/TemplateManagerImplTest.java | 9 + ui/scripts/instances.js | 167 ++++++++++++++++++- ui/scripts/templates.js | 121 +++++++++++++- ui/scripts/ui-custom/granularSettings.js | 86 +++++++++- 12 files changed, 445 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/202b92f2/api/src/org/apache/cloudstack/api/ApiConstants.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/202b92f2/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/202b92f2/ui/scripts/instances.js ----------------------------------------------------------------------
