Merge remote-tracking branch 'public/master' into 1.6.79-rc

Signed-off-by: Andrew Nikitin <[email protected]>

Author: Andrew Nikitin

indy_node/server/validator_info_tool.py

@@ -1,4 +1,6 @@
 import importlib
+import time
+import os
 
 from indy_node.__metadata__ import __version__ as node_pgk_version
 from plenum.server.validator_info_tool import none_on_fail, \
@@ -11,9 +13,12 @@ class ValidatorNodeInfoTool(PlenumValidatorNodeInfoTool):
     @property
     def info(self):
         info = super().info
+        ts_str = "{}".format(time.strftime(
+            "%A, %B %{0}d, %Y %{0}I:%M:%S %p %z".format('#' if os.name == 'nt' else '-'),
+            time.localtime(info["timestamp"])))
+        info.update({"Update time": ts_str})
         if 'Node_info' in info:
             if 'Metrics' in info['Node_info']:
-                info['Node_info']['Metrics']['transaction-count'].update(config=self.__config_ledger_size)
                 std_ledgers = [POOL_LEDGER_ID, DOMAIN_LEDGER_ID, CONFIG_LEDGER_ID]
                 other_ledgers = {}
                 for idx, linfo in self._node.ledgerManager.ledgerRegistry.items():
@@ -24,23 +29,18 @@ def info(self):
 
         return info
 
-    @property
-    @none_on_fail
-    def software_info(self):
-        info = super().software_info
-        if 'Software' in info:
-            info['Software'].update({'indy-node': self.__node_pkg_version})
-            try:
-                pkg = importlib.import_module(self._config.UPGRADE_ENTRY)
-                info['Software'].update({self._config.UPGRADE_ENTRY: pkg.__version__})
-            except Exception:
-                pass
-        return info
-
-    @property
     @none_on_fail
-    def __config_ledger_size(self):
-        return self._node.configLedger.size
+    def _generate_software_info(self):
+        sfv = super()._generate_software_info()
+        sfv['Software'].update({'indy-node': self.__node_pkg_version})
+        sfv['Software'].update({'sovrin': "unknown"})
+        try:
+            pkg = importlib.import_module(self._config.UPGRADE_ENTRY)
+            sfv['Software'].update({self._config.UPGRADE_ENTRY: pkg.__version__})
+        except Exception:
+            pass
+
+        return sfv
 
     @property
     @none_on_fail

indy_node/test/validator_info/test_validator_info.py

@@ -37,7 +37,6 @@ def test_validator_info_ha_fields_valid(node, info):
     assert info['Node_info']['Client_port']
 
 
-@pytest.mark.skip(reason="info will not be included by default")
 def test_validator_info_file_software_indy_node_valid(info):
     assert info['Software']['indy-node'] == node_pgk_version
 
@@ -186,4 +185,13 @@ def test_validator_info_file_metrics_count_all_ledgers_field_valid(node):
         node.ledgerManager.addLedger(newid, FakeLedgerEx(newid, newid))
     info = node._info_tool.info
     has_cnt = len(info['Node_info']['Metrics']['transaction-count'])
-    assert has_cnt == len(new_ids) + 3
+    assert has_cnt == len(new_ids) + 3
+
+
+def test_validator_info_update_date_field_valid(info):
+    assert "Update time" in info
+    import time
+    import datetime
+    from_str = time.mktime(datetime.datetime.strptime(info["Update time"],
+                                                      "%A, %B %d, %Y %I:%M:%S %p %z").timetuple())
+    assert int(from_str) == info["timestamp"]