Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CA-357771: Remove StorageLink leftovers (CVSM / cslg) in xsconsole #40

Conversation

bernhardkaindl
Copy link
Collaborator

Remove last forgotten leftovers of the StorageLink code (StorageLink and /opt/Citrix/StorageLink/bin/csl were removed in XS 6.5)

@kc284 found a few remaining leftovers from StorageLink (CVSM / cslg) that we should remove.

Kindly asking for your review, thanks.

@MarkSymsCtx
Copy link
Contributor

If we're having a cleanup we should be thorough about it, all of these are also obsolete -

  • 'Label-SR.SRTypes-ebs' : 'Elastic Block Storage'
  • 'Label-SR.SRTypes-equal' : 'Dell EqualLogic'
  • 'Label-SR.SRTypes-netapp' : 'NetApp'

The NTP feature file appears not to belong in this PR and should probably be in a PR of it's own? In and of itself it looks fine, just doesn't relate to removing left over bits of storage cruft.

Remove these obsolete strings:
'Label-SR.SRTypes-cslg' :         'Citrix StorageLink Gateway',
'Label-host.system_status-CVSM' : 'Citrix StorageLink configuration',
'Label-SR.SRTypes-ebs' :          'Elastic Block Storage'
'Label-SR.SRTypes-equal' :        'Dell EqualLogic'
'Label-SR.SRTypes-netapp' :       'NetApp'

Signed-off-by: Bernhard Kaindl <[email protected]>
@bernhardkaindl bernhardkaindl force-pushed the CA-357771/remove-StorageLink-CVSM-cslg-leftovers branch from ecf9f6f to d6a8a61 Compare May 7, 2024 00:15
@bernhardkaindl
Copy link
Collaborator Author

@MarkSymsCtx: Thanks for your review!

This PR now also removes the strings that you mentioned, please review again, Thanks!

git log -p -n1 -U0
commit d6a8a6174c13b1b1008361ea97574edef4074968

    CA-357771: remove obsolete strings: StorageLink(CVSM/cslg) leftovers

    Remove these obsolete strings:
    'Label-SR.SRTypes-cslg' :         'Citrix StorageLink Gateway'
    'Label-host.system_status-CVSM' : 'Citrix StorageLink configuration'
    'Label-SR.SRTypes-ebs' :          'Elastic Block Storage'
    'Label-SR.SRTypes-equal' :        'Dell EqualLogic'
    'Label-SR.SRTypes-netapp' :       'NetApp'

    Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>

diff --git a/XSConsoleLangFriendlyNames.py b/XSConsoleLangFriendlyNames.py
index 6720906..c0c154b 100644
--- a/XSConsoleLangFriendlyNames.py
+++ b/XSConsoleLangFriendlyNames.py
@@ -597,2 +596,0 @@ class LangFriendlyNames:
-    'Label-SR.SRTypes-cslg' : 'Citrix StorageLink Gateway',
-    'Label-SR.SRTypes-ebs' : 'Elastic Block Storage',
@@ -601 +598,0 @@ class LangFriendlyNames:
-    'Label-SR.SRTypes-equal' : 'Dell EqualLogic',
@@ -609 +605,0 @@ class LangFriendlyNames:
-    'Label-SR.SRTypes-netapp' : 'NetApp',
@@ -978 +973,0 @@ class LangFriendlyNames:
-    'Label-host.system_status-CVSM' : 'Citrix StorageLink configuration',

@kc284 kc284 changed the title CA357771: Remove StorageLink leftovers (CVSM / cslg) in xsconsole CA-357771: Remove StorageLink leftovers (CVSM / cslg) in xsconsole May 7, 2024
@bernhardkaindl bernhardkaindl merged commit e6ce0f5 into xapi-project:master May 8, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants