-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding 'host' info to volume-compute connection information.
Added a new key 'host' for the initialize/terminate volume connection information. Updated the HpSanISCSIDriver to use teh initialize and terminate methods. Added missing unit tests for the HpSanISCSIDriver. Fixes bug 992729. Change-Id: I09fad6b5328cbfb860ab2c7ae5d206010f3dd45d
- Loading branch information
Showing
10 changed files
with
286 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Copyright 2012 OpenStack LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
# not use this file except in compliance with the License. You may obtain | ||
# a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
# License for the specific language governing permissions and limitations | ||
# under the License. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,212 @@ | ||
# Copyright 2012 OpenStack LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
# not use this file except in compliance with the License. You may obtain | ||
# a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
# License for the specific language governing permissions and limitations | ||
# under the License. | ||
from nova import exception | ||
from nova import log as logging | ||
from nova.volume import san | ||
from nova import test | ||
|
||
LOG = logging.getLogger(__name__) | ||
|
||
|
||
class HpSanISCSITestCase(test.TestCase): | ||
|
||
def setUp(self): | ||
super(HpSanISCSITestCase, self).setUp() | ||
self.stubs.Set(san.HpSanISCSIDriver, "_cliq_run", | ||
self._fake_cliq_run) | ||
self.stubs.Set(san.HpSanISCSIDriver, "_get_iscsi_properties", | ||
self._fake_get_iscsi_properties) | ||
self.driver = san.HpSanISCSIDriver() | ||
self.volume_name = "fakevolume" | ||
self.connector = {'ip': '10.0.0.2', | ||
'initiator': 'iqn.1993-08.org.debian:01:222', | ||
'host': 'fakehost'} | ||
self.properties = {'target_discoverd': True, | ||
'target_portal': '10.0.1.6:3260', | ||
'target_iqn': | ||
'iqn.2003-10.com.lefthandnetworks:group01:25366:fakev', | ||
'volume_id': 1} | ||
|
||
def tearDown(self): | ||
super(HpSanISCSITestCase, self).tearDown() | ||
|
||
def _fake_get_iscsi_properties(self, volume): | ||
return self.properties | ||
|
||
def _fake_cliq_run(self, verb, cliq_args): | ||
"""Return fake results for the various methods.""" | ||
|
||
def create_volume(cliq_args): | ||
""" | ||
input = "createVolume description="fake description" | ||
clusterName=Cluster01 volumeName=fakevolume | ||
thinProvision=0 output=XML size=1GB" | ||
""" | ||
output = """<gauche version="1.0"> | ||
<response description="Operation succeeded." | ||
name="CliqSuccess" processingTime="181" result="0"/> | ||
</gauche>""" | ||
self.assertEqual(cliq_args['volumeName'], self.volume_name) | ||
self.assertEqual(cliq_args['thinProvision'], '1') | ||
self.assertEqual(cliq_args['size'], '1GB') | ||
return output, None | ||
|
||
def delete_volume(cliq_args): | ||
""" | ||
input = "deleteVolume volumeName=fakevolume prompt=false | ||
output=XML" | ||
""" | ||
output = """<gauche version="1.0"> | ||
<response description="Operation succeeded." | ||
name="CliqSuccess" processingTime="164" result="0"/> | ||
</gauche>""" | ||
self.assertEqual(cliq_args['volumeName'], self.volume_name) | ||
self.assertEqual(cliq_args['prompt'], 'false') | ||
return output, None | ||
|
||
def assign_volume(cliq_args): | ||
""" | ||
input = "assignVolumeToServer volumeName=fakevolume | ||
serverName=fakehost | ||
output=XML" | ||
""" | ||
output = """<gauche version="1.0"> | ||
<response description="Operation succeeded." | ||
name="CliqSuccess" processingTime="174" result="0"/> | ||
</gauche>""" | ||
self.assertEqual(cliq_args['volumeName'], self.volume_name) | ||
self.assertEqual(cliq_args['serverName'], self.connector['host']) | ||
return output, None | ||
|
||
def unassign_volume(cliq_args): | ||
""" | ||
input = "unassignVolumeToServer volumeName=fakevolume | ||
serverName=fakehost output=XML | ||
""" | ||
output = """<gauche version="1.0"> | ||
<response description="Operation succeeded." | ||
name="CliqSuccess" processingTime="205" result="0"/> | ||
</gauche>""" | ||
self.assertEqual(cliq_args['volumeName'], self.volume_name) | ||
self.assertEqual(cliq_args['serverName'], self.connector['host']) | ||
return output, None | ||
|
||
def get_cluster_info(cliq_args): | ||
""" | ||
input = "getClusterInfo clusterName=Cluster01 searchDepth=1 | ||
verbose=0 output=XML" | ||
""" | ||
output = """<gauche version="1.0"> | ||
<response description="Operation succeeded." name="CliqSuccess" | ||
processingTime="1164" result="0"> | ||
<cluster blockSize="1024" description="" | ||
maxVolumeSizeReplication1="622957690" | ||
maxVolumeSizeReplication2="311480287" | ||
minVolumeSize="262144" name="Cluster01" | ||
pageSize="262144" spaceTotal="633697992" | ||
storageNodeCount="2" unprovisionedSpace="622960574" | ||
useVip="true"> | ||
<nsm ipAddress="10.0.1.7" name="111-vsa"/> | ||
<nsm ipAddress="10.0.1.8" name="112-vsa"/> | ||
<vip ipAddress="10.0.1.6" subnetMask="255.255.255.0"/> | ||
</cluster></response></gauche>""" | ||
return output, None | ||
|
||
def get_volume_info(cliq_args): | ||
""" | ||
input = "getVolumeInfo volumeName=fakevolume output=XML" | ||
""" | ||
output = """<gauche version="1.0"> | ||
<response description="Operation succeeded." name="CliqSuccess" | ||
processingTime="87" result="0"> | ||
<volume autogrowPages="4" availability="online" | ||
blockSize="1024" bytesWritten="0" checkSum="false" | ||
clusterName="Cluster01" created="2011-02-08T19:56:53Z" | ||
deleting="false" description="" groupName="Group01" | ||
initialQuota="536870912" isPrimary="true" | ||
iscsiIqn="iqn.2003-10.com.lefthandnetworks:group01:25366:fakev" | ||
maxSize="6865387257856" md5="9fa5c8b2cca54b2948a63d833097e1ca" | ||
minReplication="1" name="vol-b" parity="0" replication="2" | ||
reserveQuota="536870912" scratchQuota="4194304" | ||
serialNumber="9fa5c8b2cca54b2948a63d8" | ||
size="1073741824" stridePages="32" thinProvision="true"> | ||
<status description="OK" value="2"/> | ||
<permission access="rw" authGroup="api-1" | ||
chapName="chapusername" chapRequired="true" | ||
id="25369" initiatorSecret="" iqn="" | ||
iscsiEnabled="true" loadBalance="true" | ||
targetSecret="supersecret"/> | ||
</volume></response></gauche>""" | ||
return output, None | ||
|
||
def test_error(cliq_args): | ||
output = """<gauche version="1.0"> | ||
<response description="Volume '134234' not found." | ||
name="CliqVolumeNotFound" processingTime="1083" | ||
result="8000100c"/> | ||
</gauche>""" | ||
return output, None | ||
|
||
self.assertEqual(cliq_args['output'], 'XML') | ||
try: | ||
verbs = {'createVolume': create_volume, | ||
'deleteVolume': delete_volume, | ||
'assignVolumeToServer': assign_volume, | ||
'unassignVolumeToServer': unassign_volume, | ||
'getClusterInfo': get_cluster_info, | ||
'getVolumeInfo': get_volume_info, | ||
'testError': test_error} | ||
except KeyError: | ||
raise NotImplementedError() | ||
|
||
return verbs[verb](cliq_args) | ||
|
||
def test_create_volume(self): | ||
volume = {'name': self.volume_name, 'size': 1} | ||
model_update = self.driver.create_volume(volume) | ||
expected_iqn = "iqn.2003-10.com.lefthandnetworks:group01:25366:fakev" | ||
expected_location = "10.0.1.6:3260,1 %s" % expected_iqn | ||
self.assertEqual(model_update['provider_location'], expected_location) | ||
|
||
def test_delete_volume(self): | ||
volume = {'name': self.volume_name} | ||
self.driver.delete_volume(volume) | ||
|
||
def test_initialize_connection(self): | ||
volume = {'name': self.volume_name} | ||
result = self.driver.initialize_connection(volume, self.connector) | ||
self.assertEqual(result['driver_volume_type'], 'iscsi') | ||
self.assertDictMatch(result['data'], self.properties) | ||
|
||
def test_terminate_connection(self): | ||
volume = {'name': self.volume_name} | ||
self.driver.terminate_connection(volume, self.connector) | ||
|
||
def test_create_snapshot(self): | ||
try: | ||
self.driver.create_snapshot("") | ||
except NotImplementedError: | ||
pass | ||
|
||
def test_create_volume_from_snapshot(self): | ||
try: | ||
self.driver.create_volume_from_snapshot("", "") | ||
except NotImplementedError: | ||
pass | ||
|
||
def test_cliq_error(self): | ||
try: | ||
self.driver._cliq_run_xml("testError", {}) | ||
except exception.Error: | ||
pass |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.