Skip to content

S
slapos.core
Commit 06977132 authored by Rafael Monnerat's avatar Rafael Monnerat 👻
Browse files
Options

slapos_crm: Check minimal supported SlapOS version 

   Create a ticket if the SlapOS version into the monitored compute node is lower them minimal supported version found for the current master.
parent 1f40afa2
Pipeline #39496 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 239 additions and 0 deletions
    master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS/my_preferred_minimal_slapos_version.xml 0 → 100644
    View file @ 06977132
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>my_preferred_minimal_slapos_version</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>external_validator_failed</string> </key>
    <value> <string>The input failed the external validator.</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>overrides</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_reference</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Minimal SlapOS client Version</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: [(\'\', \'\')] + [(x.getTitle(), x.getRelativeUrl()) for x in here.portal_catalog(portal_type=\'Service\', sort_on=((\'title\', \'ASC\'),),checked_permission=\'View\')]</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_crm/PropertySheetTemplateItem/portal_property_sheets/SlapOSCRMSystemPreference/preferred_minimal_slapos_version_property.xml 0 → 100644
    View file @ 06977132
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Standard Property" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>elementary_type/string</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>preferred_minimal_slapos_version_property</string> </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Standard Property</string> </value>
    </item>
    <item>
    <key> <string>preference</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>property_default</string> </key>
    <value> <string>python:\'\'</string> </value>
    </item>
    <item>
    <key> <string>write_permission</string> </key>
    <value> <string>Manage properties</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/ComputeNode_getReportedErrorDict.py
    View file @ 06977132
    ...@@ -58,6 +58,21 @@ if data_array: ...@@ -58,6 +58,21 @@ if data_array:
    compute_node_title, reference, error_dict['issue_document_reference']) compute_node_title, reference, error_dict['issue_document_reference'])
    return error_dict return error_dict
    minimal_slapos_version = portal.portal_preferences.getPreferredMinimalSlaposVersion('1.10')
    # If version isn't uploaded yet dont fail too early
    compute_node_version = context.getSlaposVersion("10000")
    if compute_node_version < minimal_slapos_version:
    error_dict['last_contact'] = last_contact
    error_dict['should_notify'] = True
    error_dict['notification_message_reference'] = "slapos-crm-compute_node_check_outdated_os.notification"
    error_dict['ticket_title'] = "Compute Node %s uses an outdated version." % reference
    error_dict['ticket_description'] = "The Compute Node %s (%s) uses an outdated slapos version: %s (expected >= %s)" % (
    compute_node_title, reference, compute_node_version, minimal_slapos_version)
    error_dict['message'] = "Slapos version is oudated on %s. It is should be newer than %s (found %s)" % (
    compute_node_title, minimal_slapos_version, compute_node_version)
    return error_dict
    # Since server is contacting, check for stalled processes # Since server is contacting, check for stalled processes
    # If server has no partitions skip # If server has no partitions skip
    compute_partition_uid_list = [ compute_partition_uid_list = [
    ......
    master/bt5/slapos_crm/TestTemplateItem/portal_components/test.erp5.testSlapOSCRMMonitoringAlarm.py
    View file @ 06977132
    ...@@ -1002,6 +1002,59 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(TestSlapOSCrmMonitoringMixin) ...@@ -1002,6 +1002,59 @@ class TestSlapOSCrmMonitoringCheckComputeNodeState(TestSlapOSCrmMonitoringMixin)
    self.assertIn(compute_node.getReference(), event.getTextContent()) self.assertIn(compute_node.getReference(), event.getTextContent())
    self.assertEventTicket(event, ticket, compute_node) self.assertEventTicket(event, ticket, compute_node)
    @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
    @simulate('NotificationTool_getDocumentValue',
    'reference=None, **kw',
    'assert reference == "slapos-crm-compute_node_check_outdated_os.notification", reference\n' \
    'return context.restrictedTraverse(' \
    'context.REQUEST["test_ComputeNode_checkMonitoringState_notify"])')
    def test_ComputeNode_checkMonitoringState_outdatedVersion(self):
    with PinnedDateTime(self, DateTime() - 1.1):
    project = self.addProject()
    self._makeComputeNode(project)
    self._makeComplexComputeNode(project)
    compute_node = self.compute_node
    compute_node.setSlaposVersion('0.9')
    # Computer and instances are accessed fine.
    compute_node.setAccessStatus("")
    self.start_requested_software_instance.setAccessStatus("")
    self.start_requested_software_installation.setAccessStatus("")
    self.tic()
    self.portal.REQUEST['test_ComputeNode_checkMonitoringState_notify'] = \
    self._makeNotificationMessage(compute_node.getReference())
    error_dict = compute_node.ComputeNode_getReportedErrorDict()
    compute_node.ComputeNode_checkMonitoringState()
    self.tic()
    ticket_title = 'Compute Node %s uses an outdated version.' % (
    compute_node.getReference()
    )
    ticket = self._getGeneratedSupportRequest(compute_node.getUid())
    self.assertNotEqual(ticket, None)
    self.assertEqual(ticket_title, error_dict['ticket_title'])
    self.assertEqual(ticket_title, ticket.getTitle())
    message = ticket.SupportRequest_recheckMonitoring()
    self.assertEqual(error_dict['message'], message)
    self.assertIn("It is should be newer than 1.10 (found 0.9)", message)
    event_list = ticket.getFollowUpRelatedValueList()
    self.assertEqual(len(event_list), 1)
    event = event_list[0]
    self.assertEqual(
    event.getTitle(),
    self.portal.restrictedTraverse(
    self.portal.REQUEST['test_ComputeNode_checkMonitoringState_notify']
    ).getTitle()
    )
    self.assertIn(compute_node.getReference(), event.getTextContent())
    self.assertEventTicket(event, ticket, compute_node)
    @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0') @simulate('Project_isSupportRequestCreationClosed', '*args, **kwargs', 'return 0')
    @simulate('NotificationTool_getDocumentValue', @simulate('NotificationTool_getDocumentValue',
    'reference=None, **kw', 'reference=None, **kw',
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7