From fe8a69131173bf2ed26fe36ba44a002af98aadaa Mon Sep 17 00:00:00 2001 From: Tom Swanson Date: Mon, 5 Jun 2017 16:58:02 -0500 Subject: [PATCH] Dell EMC SC: Updated Created by Message The notes field message Created by Dell Cinder Driver changed to Created by Dell EMC Cinder Driver. Change-Id: Ie556e0c88f51dd33e5ba865afbf53e50140aae9d --- .../volume/drivers/dell_emc/sc/test_fc.py | 2 +- .../volume/drivers/dell_emc/sc/test_sc.py | 4 ++-- .../volume/drivers/dell_emc/sc/test_scapi.py | 22 +++++++++---------- .../drivers/dell_emc/sc/storagecenter_api.py | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/dell_emc/sc/test_fc.py b/cinder/tests/unit/volume/drivers/dell_emc/sc/test_fc.py index fd59e0a121f..fec94a3656c 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/sc/test_fc.py +++ b/cinder/tests/unit/volume/drivers/dell_emc/sc/test_fc.py @@ -96,7 +96,7 @@ class DellSCSanFCDriverTestCase(test.TestCase): u'name': u'Server_21000024ff30441d', u'hbaPresent': True, u'hbaCount': 2, - u'notes': u'Created by Dell Cinder Driver', + u'notes': u'Created by Dell EMC Cinder Driver', u'mapped': False, u'operatingSystem': {u'instanceId': u'64702.38', u'instanceName': u'Red Hat Linux 6.x', diff --git a/cinder/tests/unit/volume/drivers/dell_emc/sc/test_sc.py b/cinder/tests/unit/volume/drivers/dell_emc/sc/test_sc.py index 4427dd2d694..1bf3c54898c 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/sc/test_sc.py +++ b/cinder/tests/unit/volume/drivers/dell_emc/sc/test_sc.py @@ -105,7 +105,7 @@ class DellSCSanISCSIDriverTestCase(test.TestCase): u'name': u'Server_21000024ff30441d', u'hbaPresent': True, u'hbaCount': 2, - u'notes': u'Created by Dell Cinder Driver', + u'notes': u'Created by Dell EMC Cinder Driver', u'mapped': False, u'operatingSystem': {u'instanceId': u'64702.38', 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'volumeCount': 0, 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'userCreated': True, u'instanceName': u'fc8f2fec-fab2-4e34-9148-c094c913b9a3', diff --git a/cinder/tests/unit/volume/drivers/dell_emc/sc/test_scapi.py b/cinder/tests/unit/volume/drivers/dell_emc/sc/test_scapi.py index 0142cf219bd..25f7d72d7e1 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/sc/test_scapi.py +++ b/cinder/tests/unit/volume/drivers/dell_emc/sc/test_scapi.py @@ -336,7 +336,7 @@ class DellSCSanAPITestCase(test.TestCase): u'name': u'Server_21000024ff30441d', u'hbaPresent': True, u'hbaCount': 2, - u'notes': u'Created by Dell Cinder Driver', + u'notes': u'Created by Dell EMC Cinder Driver', u'mapped': False, u'operatingSystem': {u'instanceId': u'64702.38', u'instanceName': u'Red Hat Linux 6.x', @@ -370,7 +370,7 @@ class DellSCSanAPITestCase(test.TestCase): u'name': u'Server_21000024ff30441d', u'hbaPresent': True, u'hbaCount': 2, - u'notes': u'Created by Dell Cinder Driver', + u'notes': u'Created by Dell EMC Cinder Driver', u'mapped': False, u'operatingSystem': {u'instanceId': u'64702.38', @@ -1369,7 +1369,7 @@ class DellSCSanAPITestCase(test.TestCase): RPLAY_PROFILE = {u'name': u'fc8f2fec-fab2-4e34-9148-c094c913b9a3', 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'expireIncompleteReplaySets': True, u'replayCreationTimeout': 20, @@ -2187,7 +2187,7 @@ class DellSCSanAPITestCase(test.TestCase): 'replay_profile_string', 'volume_qos', 'group_qos', 'datareductionprofile') expected_payload = {'Name': self.volume_name, - 'Notes': 'Created by Dell Cinder Driver', + 'Notes': 'Created by Dell EMC Cinder Driver', 'Size': '1 GB', 'StorageCenter': 12345, 'VolumeFolder': '12345.200', @@ -4613,7 +4613,7 @@ class DellSCSanAPITestCase(test.TestCase): 'name', screplay, 'replay_profile_string', 'volume_qos', 'group_qos', 'datareductionprofile') expected_payload = {'Name': 'name', - 'Notes': 'Created by Dell Cinder Driver', + 'Notes': 'Created by Dell EMC Cinder Driver', 'VolumeFolder': '12345.200', 'ReplayProfileList': ['12345.4'], 'VolumeQosProfile': '12345.2', @@ -4656,7 +4656,7 @@ class DellSCSanAPITestCase(test.TestCase): 'group_qos', None) expected_payload = {'Name': 'name', - 'Notes': 'Created by Dell Cinder Driver', + 'Notes': 'Created by Dell EMC Cinder Driver', 'VolumeFolder': '12345.200', 'ReplayProfileList': ['12345.4'], 'VolumeQosProfile': '12345.2', @@ -4692,7 +4692,7 @@ class DellSCSanAPITestCase(test.TestCase): 'group_qos', None) expected_payload = {'Name': 'name', - 'Notes': 'Created by Dell Cinder Driver', + 'Notes': 'Created by Dell EMC Cinder Driver', 'VolumeFolder': '12345.200', 'VolumeQosProfile': '12345.2', 'GroupQosProfile': '12345.3'} @@ -6872,7 +6872,7 @@ class DellSCSanAPITestCase(test.TestCase): ssn = 64702 destssn = 65495 qosnode = 'Cinder QoS' - notes = 'Created by Dell Cinder Driver' + notes = 'Created by Dell EMC Cinder Driver' repl_prefix = 'Cinder repl of ' mock_find_sc.side_effect = [destssn, ssn, destssn, ssn, destssn, ssn] @@ -6936,7 +6936,7 @@ class DellSCSanAPITestCase(test.TestCase): ssn = 64702 destssn = 65495 qosnode = 'Cinder QoS' - notes = 'Created by Dell Cinder Driver' + notes = 'Created by Dell EMC Cinder Driver' repl_prefix = 'Cinder repl of ' mock_find_sc.side_effect = [destssn, ssn, destssn, ssn] @@ -7515,7 +7515,7 @@ class DellSCSanAPITestCase(test.TestCase): 'Type': 'Synchronous', 'PrimaryVolume': '101.1', 'SecondaryVolumeAttributes': - {'Notes': 'Created by Dell Cinder Driver', + {'Notes': 'Created by Dell EMC Cinder Driver', 'CreateSourceVolumeFolderPath': True, 'Name': 'name'} } @@ -7783,7 +7783,7 @@ class DellSCSanAPITestCase(test.TestCase): mock_post.assert_called_once_with( 'StorageCenter/ScReplay/11111.201/CreateView', {'Name': 'fback:guidb', - 'Notes': 'Created by Dell Cinder Driver', + 'Notes': 'Created by Dell EMC Cinder Driver', 'VolumeFolder': '11111.1'}, True) mock_create_replay.assert_called_once_with(svolume, 'failback', 600) diff --git a/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py b/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py index 97a7d70faa0..9a04a6acc5c 100644 --- a/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py +++ b/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py @@ -433,7 +433,7 @@ class SCApi(object): should be turned on or not. :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.ssn = None # primaryssn is the ssn of the SC we are configured to use. This