Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AWS] Add Default Region/Zone to Connection and Allow API Calls to Specify Target Zone by #1067 #1135

Merged
merged 3 commits into from
Apr 2, 2024
Merged

[AWS] Add Default Region/Zone to Connection and Allow API Calls to Specify Target Zone by #1067 #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91bf3e2
issue_1067 aws : set zone to subnet
dogfootman Mar 29, 2024
09fa9f8
issue_1067 aws : set zone for disk
dogfootman Apr 1, 2024
038f933
Merge pull request #157 from MZC-CSC/issue_1067_add_default_regionzone
MZC-CSC Apr 1, 2024
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
12 changes: 8 additions & 4 deletions cloud-control-manager/cloud-driver/drivers/aws/resources/DiskHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ func (DiskHandler *AwsDiskHandler) CreateDisk(diskReqInfo irs.DiskInfo) (irs.Dis
start := call.Start()

zone := DiskHandler.Region.Zone
spew.Dump(DiskHandler.Region)

if diskReqInfo.Zone != ""{
zone = diskReqInfo.Zone
}
//spew.Dump(DiskHandler.Region)
err := validateCreateDisk(&diskReqInfo)
if err != nil {
return irs.DiskInfo{}, err
Expand Down Expand Up @@ -104,7 +108,7 @@ func (DiskHandler *AwsDiskHandler) CreateDisk(diskReqInfo irs.DiskInfo) (irs.Dis
// case3 : 암호화된 disk 생성
//input.Encrypted = true
//input.KmsKeyId = ""
spew.Dump(input)
//spew.Dump(input)
result, err := DiskHandler.Client.CreateVolume(input)
hiscallInfo.ElapsedTime = call.Elapsed(start)
if err != nil {
Expand Down Expand Up @@ -331,7 +335,7 @@ func (DiskHandler *AwsDiskHandler) AttachDisk(diskIID irs.IID, ownerVM irs.IID)
return irs.DiskInfo{}, err
}

spew.Dump(diskDeviceList)
//spew.Dump(diskDeviceList)
if diskDeviceList != nil {
isAvailable := true
for _, avn := range availableVolumeNames {
Expand Down Expand Up @@ -890,7 +894,7 @@ func (DiskHandler *AwsDiskHandler) convertVolumeInfoToDiskInfo(volumeInfo *ec2.V
}

diskInfo.CreatedTime = *volumeInfo.CreateTime
spew.Dump(volumeInfo)
//spew.Dump(volumeInfo)
//KeyValueList []KeyValue
var inKeyValueList []irs.KeyValue
//if !reflect.ValueOf(volumeInfo.Encrypted).IsNil() {
Expand Down
Loading
Loading