openstack/cinder
Code Issues Proposed changes

Merge "Dell EMC SC: Updated Created by Message"

Browse Source
This commit is contained in:
Jenkins 2017-06-06 01:44:53 +00:00 committed by Gerrit Code Review
commit ad6d14b6d4
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/volume/drivers/dell_emc/sc/test_fc.py
View File

@ -96,7 +96,7 @@ class DellSCSanFCDriverTestCase(test.TestCase):
u'name': u'Server_21000024ff30441d', u'name': u'Server_21000024ff30441d',
u'hbaPresent': True, u'hbaPresent': True,
u'hbaCount': 2, u'hbaCount': 2,
u'notes': u'Created by Dell Cinder Driver', u'notes': u'Created by Dell EMC Cinder Driver',
u'mapped': False, u'mapped': False,
u'operatingSystem': {u'instanceId': u'64702.38', u'operatingSystem': {u'instanceId': u'64702.38',
u'instanceName': u'Red Hat Linux 6.x', u'instanceName': u'Red Hat Linux 6.x',

4
cinder/tests/unit/volume/drivers/dell_emc/sc/test_sc.py
View File

@ -105,7 +105,7 @@ class DellSCSanISCSIDriverTestCase(test.TestCase):
u'name': u'Server_21000024ff30441d', u'name': u'Server_21000024ff30441d',
u'hbaPresent': True, u'hbaPresent': True,
u'hbaCount': 2, u'hbaCount': 2,
u'notes': u'Created by Dell Cinder Driver', u'notes': u'Created by Dell EMC Cinder Driver',
u'mapped': False, u'mapped': False,
u'operatingSystem': {u'instanceId': u'64702.38', u'operatingSystem': {u'instanceId': u'64702.38',
u'instanceName': u'Red Hat Linux 6.x', u'instanceName': u'Red Hat Linux 6.x',
@ -181,7 +181,7 @@ class DellSCSanISCSIDriverTestCase(test.TestCase):
u'name': u'fc8f2fec-fab2-4e34-9148-c094c913b9a3', u'name': u'fc8f2fec-fab2-4e34-9148-c094c913b9a3',
u'volumeCount': 0, u'volumeCount': 0,
u'scName': u'Storage Center 64702', u'scName': u'Storage Center 64702',
u'notes': u'Created by Dell Cinder Driver', u'notes': u'Created by Dell EMC Cinder Driver',
u'scSerialNumber': 64702, u'scSerialNumber': 64702,
u'userCreated': True, u'userCreated': True,
u'instanceName': u'fc8f2fec-fab2-4e34-9148-c094c913b9a3', u'instanceName': u'fc8f2fec-fab2-4e34-9148-c094c913b9a3',

22
cinder/tests/unit/volume/drivers/dell_emc/sc/test_scapi.py
View File

@ -336,7 +336,7 @@ class DellSCSanAPITestCase(test.TestCase):
u'name': u'Server_21000024ff30441d', u'name': u'Server_21000024ff30441d',
u'hbaPresent': True, u'hbaPresent': True,
u'hbaCount': 2, u'hbaCount': 2,
u'notes': u'Created by Dell Cinder Driver', u'notes': u'Created by Dell EMC Cinder Driver',
u'mapped': False, u'mapped': False,
u'operatingSystem': {u'instanceId': u'64702.38', u'operatingSystem': {u'instanceId': u'64702.38',
u'instanceName': u'Red Hat Linux 6.x', u'instanceName': u'Red Hat Linux 6.x',
@ -370,7 +370,7 @@ class DellSCSanAPITestCase(test.TestCase):
u'name': u'Server_21000024ff30441d', u'name': u'Server_21000024ff30441d',
u'hbaPresent': True, u'hbaPresent': True,
u'hbaCount': 2, u'hbaCount': 2,
u'notes': u'Created by Dell Cinder Driver', u'notes': u'Created by Dell EMC Cinder Driver',
u'mapped': False, u'mapped': False,
u'operatingSystem': u'operatingSystem':
{u'instanceId': u'64702.38', {u'instanceId': u'64702.38',
@ -1369,7 +1369,7 @@ class DellSCSanAPITestCase(test.TestCase):
RPLAY_PROFILE = {u'name': u'fc8f2fec-fab2-4e34-9148-c094c913b9a3', RPLAY_PROFILE = {u'name': u'fc8f2fec-fab2-4e34-9148-c094c913b9a3',
u'type': u'Consistent', u'type': u'Consistent',
u'notes': u'Created by Dell Cinder Driver', u'notes': u'Created by Dell EMC Cinder Driver',
u'volumeCount': 0, u'volumeCount': 0,
u'expireIncompleteReplaySets': True, u'expireIncompleteReplaySets': True,
u'replayCreationTimeout': 20, u'replayCreationTimeout': 20,
@ -2187,7 +2187,7 @@ class DellSCSanAPITestCase(test.TestCase):
'replay_profile_string', 'volume_qos', 'replay_profile_string', 'volume_qos',
'group_qos', 'datareductionprofile') 'group_qos', 'datareductionprofile')
expected_payload = {'Name': self.volume_name, expected_payload = {'Name': self.volume_name,
'Notes': 'Created by Dell Cinder Driver', 'Notes': 'Created by Dell EMC Cinder Driver',
'Size': '1 GB', 'Size': '1 GB',
'StorageCenter': 12345, 'StorageCenter': 12345,
'VolumeFolder': '12345.200', 'VolumeFolder': '12345.200',
@ -4613,7 +4613,7 @@ class DellSCSanAPITestCase(test.TestCase):
'name', screplay, 'replay_profile_string', 'volume_qos', 'name', screplay, 'replay_profile_string', 'volume_qos',
'group_qos', 'datareductionprofile') 'group_qos', 'datareductionprofile')
expected_payload = {'Name': 'name', expected_payload = {'Name': 'name',
'Notes': 'Created by Dell Cinder Driver', 'Notes': 'Created by Dell EMC Cinder Driver',
'VolumeFolder': '12345.200', 'VolumeFolder': '12345.200',
'ReplayProfileList': ['12345.4'], 'ReplayProfileList': ['12345.4'],
'VolumeQosProfile': '12345.2', 'VolumeQosProfile': '12345.2',
@ -4656,7 +4656,7 @@ class DellSCSanAPITestCase(test.TestCase):
'group_qos', 'group_qos',
None) None)
expected_payload = {'Name': 'name', expected_payload = {'Name': 'name',
'Notes': 'Created by Dell Cinder Driver', 'Notes': 'Created by Dell EMC Cinder Driver',
'VolumeFolder': '12345.200', 'VolumeFolder': '12345.200',
'ReplayProfileList': ['12345.4'], 'ReplayProfileList': ['12345.4'],
'VolumeQosProfile': '12345.2', 'VolumeQosProfile': '12345.2',
@ -4692,7 +4692,7 @@ class DellSCSanAPITestCase(test.TestCase):
'group_qos', 'group_qos',
None) None)
expected_payload = {'Name': 'name', expected_payload = {'Name': 'name',
'Notes': 'Created by Dell Cinder Driver', 'Notes': 'Created by Dell EMC Cinder Driver',
'VolumeFolder': '12345.200', 'VolumeFolder': '12345.200',
'VolumeQosProfile': '12345.2', 'VolumeQosProfile': '12345.2',
'GroupQosProfile': '12345.3'} 'GroupQosProfile': '12345.3'}
@ -6872,7 +6872,7 @@ class DellSCSanAPITestCase(test.TestCase):
ssn = 64702 ssn = 64702
destssn = 65495 destssn = 65495
qosnode = 'Cinder QoS' qosnode = 'Cinder QoS'
notes = 'Created by Dell Cinder Driver' notes = 'Created by Dell EMC Cinder Driver'
repl_prefix = 'Cinder repl of ' repl_prefix = 'Cinder repl of '
mock_find_sc.side_effect = [destssn, ssn, destssn, ssn, destssn, ssn] mock_find_sc.side_effect = [destssn, ssn, destssn, ssn, destssn, ssn]
@ -6936,7 +6936,7 @@ class DellSCSanAPITestCase(test.TestCase):
ssn = 64702 ssn = 64702
destssn = 65495 destssn = 65495
qosnode = 'Cinder QoS' qosnode = 'Cinder QoS'
notes = 'Created by Dell Cinder Driver' notes = 'Created by Dell EMC Cinder Driver'
repl_prefix = 'Cinder repl of ' repl_prefix = 'Cinder repl of '
mock_find_sc.side_effect = [destssn, ssn, destssn, ssn] mock_find_sc.side_effect = [destssn, ssn, destssn, ssn]
@ -7515,7 +7515,7 @@ class DellSCSanAPITestCase(test.TestCase):
'Type': 'Synchronous', 'Type': 'Synchronous',
'PrimaryVolume': '101.1', 'PrimaryVolume': '101.1',
'SecondaryVolumeAttributes': 'SecondaryVolumeAttributes':
{'Notes': 'Created by Dell Cinder Driver', {'Notes': 'Created by Dell EMC Cinder Driver',
'CreateSourceVolumeFolderPath': True, 'CreateSourceVolumeFolderPath': True,
'Name': 'name'} 'Name': 'name'}
} }
@ -7783,7 +7783,7 @@ class DellSCSanAPITestCase(test.TestCase):
mock_post.assert_called_once_with( mock_post.assert_called_once_with(
'StorageCenter/ScReplay/11111.201/CreateView', 'StorageCenter/ScReplay/11111.201/CreateView',
{'Name': 'fback:guidb', {'Name': 'fback:guidb',
'Notes': 'Created by Dell Cinder Driver', 'Notes': 'Created by Dell EMC Cinder Driver',
'VolumeFolder': '11111.1'}, 'VolumeFolder': '11111.1'},
True) True)
mock_create_replay.assert_called_once_with(svolume, 'failback', 600) mock_create_replay.assert_called_once_with(svolume, 'failback', 600)

2
cinder/volume/drivers/dell_emc/sc/storagecenter_api.py
View File

@ -433,7 +433,7 @@ class SCApi(object):
should be turned on or not. should be turned on or not.
:param apiversion: Version used on login. :param apiversion: Version used on login.
""" """
self.notes = 'Created by Dell Cinder Driver' self.notes = 'Created by Dell EMC Cinder Driver'
self.repl_prefix = 'Cinder repl of ' self.repl_prefix = 'Cinder repl of '
self.ssn = None self.ssn = None
# primaryssn is the ssn of the SC we are configured to use. This # primaryssn is the ssn of the SC we are configured to use. This