Skip to content
Snippets Groups Projects
Commit b5a2cce6 authored by Yas Naoi's avatar Yas Naoi
Browse files

Updated.

parent 092dc356
No related branches found
No related tags found
No related merge requests found
...@@ -72,8 +72,8 @@ function _aws_ec2_lib_get_snapshots_by_id_db($cloud_context, $ss_id) { ...@@ -72,8 +72,8 @@ function _aws_ec2_lib_get_snapshots_by_id_db($cloud_context, $ss_id) {
snap.status as snap_status , snap.status as snap_status ,
snap.volume_id as snap_volume_id , snap.volume_id as snap_volume_id ,
snap.created as snap_created , snap.created as snap_created ,
vol.nickname as vol_nickname , vol.nickname as vol_nickname ,
snap.volume_size as vol_size , snap.volume_size as vol_size ,
vol.vol_zone as vol_zone vol.vol_zone as vol_zone
from from
( SELECT c.snapshot_id, c.nickname, c.volume_id, c.status, c.created, c.progress, c.volume_size FROM {' . $ec2_lib_snapshot_table . '} c ( SELECT c.snapshot_id, c.nickname, c.volume_id, c.status, c.created, c.progress, c.volume_size FROM {' . $ec2_lib_snapshot_table . '} c
...@@ -144,7 +144,7 @@ function _aws_ec2_lib_download_describe_snapshots($cloud_context) { ...@@ -144,7 +144,7 @@ function _aws_ec2_lib_download_describe_snapshots($cloud_context) {
&& $item->ownerId == $owner_id) { && $item->ownerId == $owner_id) {
$insert_query = $insert_query . " ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ," ; $insert_query = $insert_query . " ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ," ;
$query_args[] = $item->snapshotId ; $query_args[] = $item->snapshotId ;
$query_args[] = $cloud_context; $query_args[] = $cloud_context ;
$tmp_nickname = cloud_check_in_array($id_nick_arr, $item->snapshotId) ; $tmp_nickname = cloud_check_in_array($id_nick_arr, $item->snapshotId) ;
$query_args[] = $tmp_nickname != NULL ? $tmp_nickname : $item->snapshotId ; $query_args[] = $tmp_nickname != NULL ? $tmp_nickname : $item->snapshotId ;
$query_args[] = $item->volumeId ; $query_args[] = $item->volumeId ;
...@@ -203,7 +203,7 @@ function _aws_ec2_lib_save_create_snapshot($cloud_context, $myclient, $ss_name, ...@@ -203,7 +203,7 @@ function _aws_ec2_lib_save_create_snapshot($cloud_context, $myclient, $ss_name,
`nickname` , `nickname` ,
`volume_id` , `volume_id` ,
`status` , `status` ,
`created` , `created` ,
`progress` , `progress` ,
`owner_id` , `owner_id` ,
`volume_size` , `volume_size` ,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment