This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit d0ff4350597 do not merge
add bd52fa8a12a New feature: VNF templates and appliances integration
(#8022)
add bc4054940b0 do not merge
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d0ff4350597)
\
N -- N -- N refs/heads/dummy (bc4054940b0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/network/VNF.java | 112 +++
.../main/java/com/cloud/server/ResourceTag.java | 1 +
api/src/main/java/com/cloud/storage/Storage.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 13 +-
.../java/org/apache/cloudstack/api/BaseCmd.java | 3 +
...yAdmin.java => ListVnfTemplatesCmdByAdmin.java} | 13 +-
.../admin/template/RegisterTemplateCmdByAdmin.java | 4 +-
...min.java => RegisterVnfTemplateCmdByAdmin.java} | 12 +-
.../admin/template/UpdateTemplateCmdByAdmin.java | 3 +-
...Admin.java => UpdateVnfTemplateCmdByAdmin.java} | 12 +-
.../DeployVnfApplianceCmdByAdmin.java} | 21 +-
.../user/template/DeleteVnfTemplateCmd.java | 47 ++
.../command/user/template/ListTemplatesCmd.java | 17 +
.../template/ListVnfTemplatesCmd.java} | 17 +-
.../command/user/template/RegisterTemplateCmd.java | 12 +-
.../user/template/RegisterVnfTemplateCmd.java | 79 ++
.../command/user/template/UpdateTemplateCmd.java | 6 +-
.../user/template/UpdateVnfTemplateCmd.java | 87 ++
.../api/command/user/vm/DeployVnfApplianceCmd.java | 74 ++
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 8 +
.../api/response/ChildTemplateResponse.java | 2 +-
.../cloudstack/api/response/NicResponse.java | 16 +
.../cloudstack/api/response/TemplateResponse.java | 2 +-
.../cloudstack/api/response/UserVmResponse.java | 60 ++
.../cloudstack/api/response/VnfNicResponse.java | 119 +++
.../api/response/VnfTemplateResponse.java | 60 ++
.../storage/template/VnfTemplateManager.java | 52 ++
.../storage/template/VnfTemplateUtils.java | 152 ++++
api/src/test/java/com/cloud/network/VNFTest.java | 58 ++
.../api/response/VnfNicResponseTest.java | 54 ++
.../api/response/VnfTemplateResponseTest.java | 40 +-
.../storage/template/VnfTemplateUtilsTest.java | 261 ++++++
.../java/com/cloud/template/TemplateManager.java | 4 +
.../com/cloud/storage/VnfTemplateDetailVO.java | 101 +++
.../java/com/cloud/storage/VnfTemplateNicVO.java | 101 +++
.../cloud/storage/dao/VnfTemplateDetailsDao.java | 16 +-
.../storage/dao/VnfTemplateDetailsDaoImpl.java | 21 +-
.../com/cloud/storage/dao/VnfTemplateNicDao.java | 19 +-
.../cloud/storage/dao/VnfTemplateNicDaoImpl.java | 53 ++
.../schema/src/main/java/com/cloud/vm/NicVO.java | 2 +
.../spring-engine-schema-core-daos-context.xml | 2 +
.../resources/META-INF/db/schema-41810to41900.sql | 224 ++++++
.../com/cloud/storage/VnfTemplateDetailVOTest.java | 28 +-
.../com/cloud/storage/VnfTemplateNicVOTest.java | 46 ++
.../storage/dao/VnfTemplateNicDaoImplTest.java | 88 +++
server/src/main/java/com/cloud/api/ApiDBUtils.java | 4 +
.../java/com/cloud/api/query/QueryManagerImpl.java | 68 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 34 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 40 +
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 8 +
.../com/cloud/template/TemplateAdapterBase.java | 5 +-
.../com/cloud/template/TemplateManagerImpl.java | 81 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 31 +-
.../storage/template/VnfTemplateManagerImpl.java | 372 +++++++++
.../core/spring-server-core-managers-context.xml | 1 +
.../com/cloud/api/query/QueryManagerImplTest.java | 28 +
.../api/query/dao/TemplateJoinDaoImplTest.java | 44 +-
.../cloud/api/query/dao/UserVmJoinDaoImplTest.java | 102 +++
.../cloud/template/TemplateManagerImplTest.java | 115 +++
.../java/com/cloud/vm/UserVmManagerImplTest.java | 71 ++
.../template/VnfTemplateManagerImplTest.java | 389 +++++++++
test/integration/smoke/test_vnf_templates.py | 341 ++++++++
tools/apidoc/gen_toc.py | 1 +
tools/marvin/marvin/lib/base.py | 312 ++++++++
ui/public/locales/en.json | 51 ++
ui/src/components/view/DetailsTab.vue | 95 ++-
ui/src/components/view/ListView.vue | 14 +-
ui/src/components/widgets/Console.vue | 2 +-
ui/src/config/section/compute.js | 3 +-
ui/src/config/section/image.js | 9 +-
ui/src/config/section/network.js | 406 ++++++++++
ui/src/views/AutogenView.vue | 9 +-
ui/src/views/compute/DeployVM.vue | 3 +-
.../{DeployVM.vue => DeployVnfAppliance.vue} | 743 +++++++++--------
.../views/compute/wizard/NetworkConfiguration.vue | 7 +
ui/src/views/compute/wizard/NetworkSelection.vue | 6 +-
ui/src/views/compute/wizard/VnfNicsSelection.vue | 166 ++++
ui/src/views/image/RegisterOrUploadTemplate.vue | 53 +-
ui/src/views/image/TemplateVnfSettings.vue | 880 +++++++++++++++++++++
ui/src/views/image/UpdateTemplate.vue | 2 +-
ui/src/views/network/VnfAppliancesTab.vue | 159 ++++
ui/src/views/network/VpcTab.vue | 5 +
82 files changed, 6329 insertions(+), 454 deletions(-)
create mode 100644 api/src/main/java/com/cloud/network/VNF.java
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/template/{UpdateTemplateCmdByAdmin.java
=> ListVnfTemplatesCmdByAdmin.java} (69%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/template/{UpdateTemplateCmdByAdmin.java
=> RegisterVnfTemplateCmdByAdmin.java} (72%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/template/{UpdateTemplateCmdByAdmin.java
=> UpdateVnfTemplateCmdByAdmin.java} (73%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/{template/UpdateTemplateCmdByAdmin.java
=> vm/DeployVnfApplianceCmdByAdmin.java} (57%)
create mode 100755
api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteVnfTemplateCmd.java
copy
api/src/main/java/org/apache/cloudstack/api/command/{admin/template/RegisterTemplateCmdByAdmin.java
=> user/template/ListVnfTemplatesCmd.java} (60%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterVnfTemplateCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateVnfTemplateCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVnfApplianceCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VnfNicResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VnfTemplateResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/storage/template/VnfTemplateManager.java
create mode 100644
api/src/main/java/org/apache/cloudstack/storage/template/VnfTemplateUtils.java
create mode 100644 api/src/test/java/com/cloud/network/VNFTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/response/VnfNicResponseTest.java
copy server/src/test/java/com/cloud/api/query/dao/UserVmJoinDaoImplTest.java
=>
api/src/test/java/org/apache/cloudstack/api/response/VnfTemplateResponseTest.java
(55%)
mode change 100755 => 100644
create mode 100644
api/src/test/java/org/apache/cloudstack/storage/template/VnfTemplateUtilsTest.java
create mode 100644
engine/schema/src/main/java/com/cloud/storage/VnfTemplateDetailVO.java
create mode 100644
engine/schema/src/main/java/com/cloud/storage/VnfTemplateNicVO.java
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java
=>
engine/schema/src/main/java/com/cloud/storage/dao/VnfTemplateDetailsDao.java
(55%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java
=>
engine/schema/src/main/java/com/cloud/storage/dao/VnfTemplateDetailsDaoImpl.java
(55%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java
=> engine/schema/src/main/java/com/cloud/storage/dao/VnfTemplateNicDao.java
(55%)
create mode 100644
engine/schema/src/main/java/com/cloud/storage/dao/VnfTemplateNicDaoImpl.java
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java
=> engine/schema/src/test/java/com/cloud/storage/VnfTemplateDetailVOTest.java
(54%)
mode change 100644 => 100755
create mode 100755
engine/schema/src/test/java/com/cloud/storage/VnfTemplateNicVOTest.java
create mode 100644
engine/schema/src/test/java/com/cloud/storage/dao/VnfTemplateNicDaoImplTest.java
create mode 100644
server/src/main/java/org/apache/cloudstack/storage/template/VnfTemplateManagerImpl.java
create mode 100644
server/src/test/java/org/apache/cloudstack/storage/template/VnfTemplateManagerImplTest.java
create mode 100644 test/integration/smoke/test_vnf_templates.py
copy ui/src/views/compute/{DeployVM.vue => DeployVnfAppliance.vue} (81%)
create mode 100644 ui/src/views/compute/wizard/VnfNicsSelection.vue
create mode 100644 ui/src/views/image/TemplateVnfSettings.vue
create mode 100644 ui/src/views/network/VnfAppliancesTab.vue
