From f680ba2e61a0db9c2edd0e41caaa6a73319037ed Mon Sep 17 00:00:00 2001 From: "John A. Chandy" Date: Mon, 4 Jun 2012 16:00:01 -0400 Subject: [PATCH] changes to osd-initiator python test scripts to bring up to OSD2r04 --- osd-initiator/python/target-cdb.py | 6 +++--- osd-initiator/python/target-osd.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/osd-initiator/python/target-cdb.py b/osd-initiator/python/target-cdb.py index 1a73f58..73d3ead 100755 --- a/osd-initiator/python/target-cdb.py +++ b/osd-initiator/python/target-cdb.py @@ -40,9 +40,9 @@ def ccap_verify(ccap, len, pid, oid): assert len == CCAP_TOTAL_LEN assert ntohl(ccap[0:4]) == CUR_CMD_ATTR_PG assert ntohl(ccap[4:8]) == len - 8 - assert ntohll(ccap[32:40]) == pid - assert ntohll(ccap[40:48]) == oid + 5 - 1 - assert ntohll(ccap[48:56]) == 0 + assert ntohll(ccap[44:52]) == pid + assert ntohll(ccap[52:60]) == oid + 5 - 1 + assert ntohll(ccap[60:68]) == 0 def test_partition(): # create partition + empty getpage_setlist diff --git a/osd-initiator/python/target-osd.py b/osd-initiator/python/target-osd.py index 6b4dfa1..4325395 100755 --- a/osd-initiator/python/target-osd.py +++ b/osd-initiator/python/target-osd.py @@ -155,9 +155,9 @@ def test_osd_get_ccap(pid, oid): assert attr.outlen == CCAP_TOTAL_LEN assert ntohl(attr.val[0:4]) == CUR_CMD_ATTR_PG assert ntohl(attr.val[4:8]) == CCAP_TOTAL_LEN - 8 - assert ntohll(attr.val[32:40]) == pid - assert ntohll(attr.val[40:48]) == oid - assert ntohll(attr.val[48:56]) == 0 + assert ntohll(attr.val[44:52]) == pid + assert ntohll(attr.val[52:60]) == oid + assert ntohll(attr.val[60:68]) == 0 def ntoh_time(buf): return (ntohs(buf[0:2]) << 32) | ntohl(buf[2:6])