Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions zthin-parts/zthin/lib/zthinshellutils
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,9 @@ function connectDisk {
# @Code:
[[ $mode ]] || mode='rr'

# Ensure rawTrackAccess 1 is passed for raw mode
vmcp "link $userID $vdev as $alias $mode" 2>&1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please explain this line?

I don't see how rawTrackAccess is used in this command.


# Obtain the disk connection lock.
local attempts=1
while [[ $(mkdir $diskConnectionLock; echo $?) -ne 0 ]]; do
Expand Down
33 changes: 16 additions & 17 deletions zvmsdk/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -2322,28 +2322,27 @@ def _create_image_table(self):
'disk_size_units varchar(512),',
'image_size_in_bytes varchar(512),',
'type varchar(16),',
'raw_track_access integer DEFAULT 0,',
'comments varchar(128))'))
with get_image_conn() as conn:
conn.execute(create_image_table_sql)

def image_add_record(self, imagename, imageosdistro, md5sum,
disk_size_units, image_size_in_bytes,
type, comments=None):
if comments is not None:
with get_image_conn() as conn:
conn.execute("INSERT INTO image (imagename, imageosdistro,"
"md5sum, disk_size_units, image_size_in_bytes,"
" type, comments) VALUES (?, ?, ?, ?, ?, ?, ?)",
(imagename, imageosdistro, md5sum,
disk_size_units, image_size_in_bytes, type,
comments))
else:
with get_image_conn() as conn:
conn.execute("INSERT INTO image (imagename, imageosdistro,"
"md5sum, disk_size_units, image_size_in_bytes,"
" type) VALUES (?, ?, ?, ?, ?, ?)",
(imagename, imageosdistro, md5sum,
disk_size_units, image_size_in_bytes, type))
disk_size_units, image_size_in_bytes,
type, raw_track_access=0, comments=None):
with get_image_conn() as conn:
if comments is not None:
conn.execute("INSERT INTO image (imagename, imageosdistro, md5sum, "
"disk_size_units, image_size_in_bytes, type, raw_track_access, comments) "
"VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
(imagename, imageosdistro, md5sum, disk_size_units,
image_size_in_bytes, type, raw_track_access, comments))
else:
conn.execute("INSERT INTO image (imagename, imageosdistro, md5sum, "
"disk_size_units, image_size_in_bytes, type, raw_track_access) "
"VALUES (?, ?, ?, ?, ?, ?, ?)",
(imagename, imageosdistro, md5sum, disk_size_units,
image_size_in_bytes, type, raw_track_access))

def image_query_record(self, imagename=None):
"""Query the image record from database, if imagename is None, all
Expand Down
4 changes: 3 additions & 1 deletion zvmsdk/imageops.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ def __init__(self):
def image_get_root_disk_size(self, image_name):
return self._smtclient.image_get_root_disk_size(image_name)

def image_import(self, image_name, url, image_meta, remote_host=None):
def image_import(self, image_name, url, image_meta, remote_host=None, raw_track_access=False, disk=None):

if not raw_track_access and disk:
self._smtclient.dasdfmt(disk)
return self._smtclient.image_import(image_name,
url,
image_meta,
Expand Down
4 changes: 3 additions & 1 deletion zvmsdk/sdkwsgi/handlers/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ def create(self, body):
remote_host = image.get('remote_host', None)
image_meta = image['image_meta']

raw_track_access = image.get('raw_track_access', False)
info = self.client.send_request('image_import', image_name,
url, image_meta, remote_host)
url, image_meta, remote_host,
raw_track_access)
return info

@validation.query_schema(image.query)
Expand Down
3 changes: 2 additions & 1 deletion zvmsdk/sdkwsgi/schemas/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
'image_name': parameter_types.name,
'url': parameter_types.url,
'image_meta': parameter_types.image_meta,
'remote_host': parameter_types.remotehost
'remote_host': parameter_types.remotehost,
'raw_track_access': parameter_types.boolean
},
'required': ['image_name', 'url', 'image_meta'],
'additionalProperties': False
Expand Down