From 5e57a38dfdf82470b73f04d43864f2c579af891e Mon Sep 17 00:00:00 2001 From: Lei Xue Date: Sun, 25 Sep 2016 20:15:41 +0800 Subject: [PATCH] add more test cases --- .travis.yml | 29 +++++++++++++++++++++++++++++ README.md | 4 +++- pkg/port/iscsit/iscsid.go | 4 ++-- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d20116..aaf2ed1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,9 @@ install: before_script: - go get github.com/kr/godep + - sudo apt-get update + - sudo apt-get install -y libcunit1 libcunit1-doc libcunit1-dev + - sudo apt-get install -y open-iscsi script: - cd ${TRAVIS_BUILD_DIR} @@ -18,3 +21,29 @@ script: - ./configure - make - hack/verify-gofmt.sh + - dd if=/dev/zero of=/var/tmp/disk.img bs=1024 count=10240 + - ./citd -v 4 1>/dev/null 2>&1 & + # libiscsi test + - mkdir ${HOME}/libiscsi + - git clone https://github.com/gostor/libiscsi ${HOME}/libiscsi + - cd ${HOME}/libiscsi + - export ISCSITEST=yes + - ./autogen.sh + - ./configure + - make + - ./test-tool/iscsi-test-cu -d --test=SCSI.Read10.Simple iscsi://127.0.0.1:3260/test-iscsi-target/0 + - ./test-tool/iscsi-test-cu -d --test=SCSI.Write10.Simple iscsi://127.0.0.1:3260/test-iscsi-target/0 + - ./utils/iscsi-ls -s iscsi://127.0.0.1:3260/test-iscsi-target + - ./utils/iscsi-inq iscsi://127.0.0.1:3260/test-iscsi-target/0 + - ./utils/iscsi-readcapacity16 iscsi://127.0.0.1:3260/test-iscsi-target/0 + # iscsi initiator test + - sudo iscsiadm -m discovery -t sendtargets -p 127.0.0.1 + - sudo iscsiadm -m node -L all + - sudo iscsiadm -m session + - sudo fdisk -l + - echo -e "n\np\n1\n\n\nt\nc\na\n1\nw" | sudo fdisk /dev/sdb + - sudo mkfs.ext3 /dev/sdb1 + - sudo mkdir -p /var/tmp/test + - sudo mount /dev/sdb1 /var/tmp/test + - sudo ls -lh /var/tmp/test/ + diff --git a/README.md b/README.md index 2fb289d..d612fef 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## gotgt [![Build Status](https://travis-ci.org/gostor/gotgt.svg)](https://travis-ci.org/gostor/gotgt) -Cloud Integrated SCSI Target framework, this includes two binaries, one is `citadm` which is command line to config and control, the other is `citd` which is a target daemon. +Simple Golang SCSI Target framework, this includes two binaries, one is `citadm` which is command line to config and control, the other is `citd` which is a target daemon. ## Build @@ -9,6 +9,8 @@ $ mkdir $GOPATH/gotstor/ $ cd $GOPATH/gostor/ $ git clone https://github.com/gostor/gotgt gotgt $ cd gotgt +$ ./autogen.sh +$ ./configure $ make ``` diff --git a/pkg/port/iscsit/iscsid.go b/pkg/port/iscsit/iscsid.go index 599aa7c..3eae154 100644 --- a/pkg/port/iscsit/iscsid.go +++ b/pkg/port/iscsit/iscsid.go @@ -343,8 +343,8 @@ func (s *ISCSITargetService) iscsiExecText(conn *iscsiConnection) error { } for _, t := range list { result = append(result, util.KeyValue{"TargetName", t.Name}) - result = append(result, util.KeyValue{"TargetAddress", "172.16.69.1:3260,1"}) - //result = append(result, util.KeyValue{"TargetAddress", "127.0.0.1:3260,1"}) + //result = append(result, util.KeyValue{"TargetAddress", "172.16.69.1:3260,1"}) + result = append(result, util.KeyValue{"TargetAddress", "127.0.0.1:3260,1"}) } } }