Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
66c019f
Initial commit adding few required managed object classes and added p…
harikrishna-patnala May 22, 2020
76c183b
Added PBM service connect
harikrishna-patnala May 26, 2020
1db6d78
pokemon anihilation and class-javadoc
DaanHoogland May 28, 2020
32aa580
Fix root folder issue on datastore
harikrishna-patnala May 28, 2020
f2ea28c
add ovf properties to template details
May 29, 2020
8311a54
disected ova processing
May 29, 2020
4772813
import
Jun 3, 2020
50678db
Added importVsphereStoragePolicies API and scheme changes
harikrishna-patnala Jun 1, 2020
b27735d
Fixed bean creation errors on VsphereStoragePolicyDaoImpl
harikrishna-patnala Jun 2, 2020
78ec211
Added Storage policy id to VO
harikrishna-patnala Jun 3, 2020
8f10d32
Moved Dao and VO files to different packages
harikrishna-patnala Jun 4, 2020
dfe20e4
Added gen_toc.py changes for API importvpsherestoragepolicies
harikrishna-patnala Jun 4, 2020
0e3f72c
Fixed unit test failure
harikrishna-patnala Jun 4, 2020
c7c4dc8
Updated code to handle sync of storage policies when importVsphereSto…
harikrishna-patnala Jun 5, 2020
957924d
Check if datastore is complaince with the storagepolicy provided in t…
harikrishna-patnala Jun 9, 2020
0b98d26
ovf string props hack
Jun 4, 2020
3481393
refactor plan in comments
Jun 5, 2020
b0eec07
trace
Jun 8, 2020
cf99526
hack to deal with: ovf property attributes in details
Jun 10, 2020
f0bbe9c
PoC code for properties iso
Jun 11, 2020
fec5e73
flag for deploy as is
Jun 11, 2020
fa93d53
factor out 700 line start command and callees
Jun 12, 2020
680fd7d
execute start; init of disk info factorred out
Jun 12, 2020
5c4bcb0
Added Storagepolicy while creating diskoffering. CreateDiskOffering A…
harikrishna-patnala Jun 5, 2020
d1af0d1
Unit test fix
harikrishna-patnala Jun 15, 2020
78cab34
license
DaanHoogland Jun 15, 2020
96f35cf
howto pass deploy OVA as is?
Jun 15, 2020
38b9a76
logging during ingestion and guest net creation
Jun 15, 2020
33994b8
more todos in comment
Jun 15, 2020
bcad5a2
Fix NPE in case of preparing secondarystorage on Host
harikrishna-patnala Jun 16, 2020
303ed33
rename pbm to vmware-pbm
Jun 16, 2020
4bee005
tested in production '{' is really needed
Jun 16, 2020
f2618ef
deploy ovf without stripping networks
Jun 16, 2020
7162e34
deploy as is parameter to DB
Jun 18, 2020
af42e1c
show deploy as is hack
Jun 18, 2020
0405f0e
extract extension
Jun 19, 2020
21f5964
path correction
Jun 19, 2020
b9f1eb5
further disect of start
Jun 19, 2020
3cb85e9
ui strings
Jun 22, 2020
2cca66c
parse networks for later reconsiliation
Jun 24, 2020
2100acb
debug and trace on registration time template processing
Jun 24, 2020
b43e45e
logging and NPE fixes
Jun 24, 2020
44e6106
template size over all disks
Jun 25, 2020
383a673
template details to contain json descriptions
Jun 25, 2020
eda5abe
Use VStorageObjectManager for disk operations.
harikrishna-patnala Jun 26, 2020
e107c06
Added PBM jar dependency for vsphere 6.7 version
harikrishna-patnala Jun 26, 2020
b2ab983
make deployasis default in API
Jun 29, 2020
d161d01
fix deplayAsIs ui
Jun 29, 2020
54b5d59
try-with-resource
Jun 29, 2020
6e040f7
details.value width
Jun 29, 2020
127a614
prevent password logging
Jun 29, 2020
243398f
whiteline
Jun 29, 2020
90c0785
deployAsIs register fixes
Jun 29, 2020
a3588cb
simple test for marshalling
Jun 29, 2020
40fc1d8
details to template properties
Jun 30, 2020
e94c4e1
property in detail finalised
Jul 1, 2020
29cc25d
[VMware] Added content library support
sureshanaparti Jul 2, 2020
ceeaeb2
1st stab at integrating content libs
Jul 6, 2020
2c017bc
Bug fixing on default base folder
harikrishna-patnala Jul 3, 2020
d8e92ba
VMFS to presetup change
harikrishna-patnala Jul 1, 2020
ecc887d
UI changes and accept any type of datastore as presetup in vmware
harikrishna-patnala Jul 6, 2020
83b30c5
Added lock while creating content library and updated delete library …
sureshanaparti Jul 6, 2020
1832700
importVsphereStoragePolices improvements
harikrishna-patnala Jul 6, 2020
3674532
Fix importstorage policies to update deleted policies on vcenter
harikrishna-patnala Jul 6, 2020
a7898db
Fix response list on importVsphereStoragePoliciescmd
harikrishna-patnala Jul 6, 2020
188deb6
Added listVsphereStoragePoliciesCmd
harikrishna-patnala Jul 6, 2020
9828b4c
license
Jul 7, 2020
1a78e1a
logging
Jul 7, 2020
1f197c8
ovf props in details
Jul 7, 2020
e40d1b7
code in comment
Jul 7, 2020
25f7e2f
unused class removed
Jul 7, 2020
ba83b9b
Updated content library creation with the datastore name instead pool…
sureshanaparti Jul 7, 2020
7046d24
Logging variable name change
harikrishna-patnala Jul 7, 2020
8fcd6c0
make sure deployAsIs is passed to template installation procedure
Jul 8, 2020
6acb1ef
info on stuborn try, instead of error
Jul 8, 2020
ea0bea7
create snapshot only when not deploy as is
Jul 8, 2020
9af2d8c
success workaround
Jul 8, 2020
f41ddec
explore need to copy
Jul 9, 2020
b2e2925
some code analyser complaints auto-fixed
Jul 10, 2020
fd2eaa6
intermediate state for copy OVA to primary
Jul 13, 2020
7bd24c3
clone multidisk template vm
Jul 13, 2020
a022511
DataStore Clusters addition as a storage pool
harikrishna-patnala Jul 13, 2020
62273e1
Assetion fix in StorageTest.java
harikrishna-patnala Jul 14, 2020
81a7508
small cleanup for handover
Jul 14, 2020
4f2836d
cleanup content library a.o.
Jul 14, 2020
cd778ef
Move the VM cloning out of volume orchestration and place it on the S…
nvazquez Jul 15, 2020
21817f3
api: change map name to properties for deployVM cmd (#60)
yadvr Jul 15, 2020
393b112
fr37: return volumeto in copycmd answer, fix start command to use def…
yadvr Jul 15, 2020
863ba2e
licenses
Jul 15, 2020
65fe1ea
disk info in details
Jul 15, 2020
f20fa97
multidisk as is deploy verified
Jul 15, 2020
5f63dc7
clone before startcommand, volume TO has VM name we can use
yadvr Jul 16, 2020
db6a724
NPE fix
yadvr Jul 16, 2020
474b5f3
startcommand: clone when only VM is not found and it's install as-is
yadvr Jul 16, 2020
d6ba80c
fix regression in properties
Jul 16, 2020
67d8122
Merge branch 'master' into vsphereAdvancedCapabilities
Jul 16, 2020
bf130aa
Import storagepolicies when vmware datacenter is added or updated
harikrishna-patnala Jul 15, 2020
de5d91b
deal with boolean properties
Jul 16, 2020
83d77e1
Volume allocation refactor
nvazquez Jul 16, 2020
db6ed43
vmware: teardown nics for cloned deploy as-is VM
yadvr Jul 17, 2020
d917815
fake root disk
Jul 17, 2020
d316887
Fix volume naming
nvazquez Jul 17, 2020
99e2535
Refactor volume allocation
nvazquez Jul 17, 2020
1017ea0
old ui properties rename
Jul 20, 2020
208c60d
send all details as details as well
Jul 20, 2020
7b30254
set proper value on vm
Jul 20, 2020
3e8a375
Send capacity in GB for OVA disks
nvazquez Jul 20, 2020
4fa8a1c
Revert sending in GB to avoid division in favour of using bytes
nvazquez Jul 20, 2020
0c0e882
comment update for status of dev work
Jul 21, 2020
9feee7c
rename method for clarification
Jul 21, 2020
ffa75e2
comment change base on exception starting existing VM
Jul 21, 2020
1b47b99
further start method modularisation
Jul 21, 2020
281a1e5
teradown again :(
Jul 21, 2020
429bdeb
log nics to tear down
Jul 21, 2020
57d1434
Discard ISOs on volumes allocation
nvazquez Jul 21, 2020
8d6e706
Add new class to parse the hardware item section
nvazquez Jul 21, 2020
f1d79bb
further disection of start method
Jul 22, 2020
d36fecd
network creation refactor/cleanup
Jul 22, 2020
ce32005
Add parsing of virtual hardware section and deployment options
nvazquez Jul 22, 2020
5c92f66
Send deployment options and store them as template details
nvazquez Jul 22, 2020
9a77129
Setter fix
nvazquez Jul 23, 2020
0f1b7af
Filter fix for configuration hardware items
nvazquez Jul 23, 2020
260d81c
log message format error fixed
Jul 23, 2020
2b1f56d
null checks
Jul 23, 2020
40928f3
Remove unused disks size template detail
nvazquez Jul 23, 2020
ee5e70f
Persist trimmed hardware items keys
nvazquez Jul 23, 2020
4ada1ea
Process CPU and memory configurations from OVF
nvazquez Jul 24, 2020
ccaf63c
Remove spaces from hardware items
nvazquez Jul 24, 2020
b305414
Add Datastore cluster and the child entities which are datastores in …
harikrishna-patnala Jul 19, 2020
2a86c5c
Register Disk to first class disk whereever possible
harikrishna-patnala Jul 21, 2020
813b6b6
Allocation logic to skip datastore cluster and consider only storagep…
harikrishna-patnala Jul 21, 2020
e0541ac
Handle datastore clusters in list storage pools to list only parent n…
harikrishna-patnala Jul 21, 2020
93f9953
Fix adding Datastore clusters and listing
harikrishna-patnala Jul 22, 2020
3efc0aa
Datastore Clusters operations on putting into maintenance mode, updat…
harikrishna-patnala Jul 22, 2020
b7e8c2f
Fix NPE on one of the register disk usecases
harikrishna-patnala Jul 22, 2020
e73308e
Datastore cluster: update tag to the child storagepools also
harikrishna-patnala Jul 22, 2020
c509a2d
Generalise linked clone formats which are different for each datastor…
harikrishna-patnala Jul 22, 2020
b5df79d
nic allocation refactor
Jul 24, 2020
51379b8
Fix immutable list to add another entry to list
harikrishna-patnala Jul 24, 2020
4947e5d
factor out removal of old VM
Jul 24, 2020
500fa0d
Add default custom offering for deploy as is templates
nvazquez Jul 25, 2020
d5453ba
inter-cluster migration support
Jul 28, 2020
2ada555
minor cleanup
Jul 28, 2020
2fa988f
adjust service offering to be available for selection in vApps
Jul 28, 2020
3b5a07c
column width for 'unique_name' at least as much as for 'name'
Jul 28, 2020
571ddf6
Fix add diskTOs to VM spec again
nvazquez Jul 28, 2020
1ee3cb8
Fix Vm start - disks mapping in progress
nvazquez Jul 28, 2020
a277cef
Fix GB size bug when registering template
nvazquez Jul 29, 2020
78690aa
Fix volumes missing path and chain info
nvazquez Jul 30, 2020
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
21 changes: 21 additions & 0 deletions api/src/main/java/com/cloud/agent/api/StoragePoolInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public class StoragePoolInfo {
StoragePoolType poolType;
long capacityBytes;
long availableBytes;
String name;
Map<String, String> details;

protected StoragePoolInfo() {
Expand Down Expand Up @@ -67,14 +68,34 @@ public String getHost() {
return host;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public void setLocalPath(String localPath) {
this.localPath = localPath;
}

public String getLocalPath() {
return localPath;
}

public void setHostPath(String hostPath) {
this.hostPath = hostPath;
}

public String getHostPath() {
return hostPath;
}

public void setPoolType(StoragePoolType poolType) {
this.poolType = poolType;
}

public StoragePoolType getPoolType() {
return poolType;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
//
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
//
package com.cloud.agent.api.storage;

import java.util.List;

public class OVFConfigurationTO {

private final String id;
private final String label;
private final String description;
private List<OVFVirtualHardwareItemTO> hardwareItems;

public OVFConfigurationTO(String id, String label, String description) {
this.id = id.toLowerCase();
this.label = label;
this.description = description;
}

public String getId() {
return id;
}

public String getLabel() {
return label;
}

public String getDescription() {
return description;
}

public void setHardwareItems(List<OVFVirtualHardwareItemTO> items) {
this.hardwareItems = items;
}

public List<OVFVirtualHardwareItemTO> getHardwareItems() {
return hardwareItems;
}
}
Loading