Session mit M. Schellhammer. Entfernung der nicht benötigten Keys

This commit is contained in:
2023-04-27 16:26:26 +02:00
parent cda9a6713d
commit 4c64ee7f18
8 changed files with 111 additions and 40 deletions
-13
View File
@@ -1147,7 +1147,6 @@ class HW():
"sps_simatic_s7_1517_3": 1,
"sps_simatic_s7_1518_4": 0,
"sps_et200_1512sp": 0,
#"memory_card_256_mb": 0
#"memory_card_2_gb": 0
"et200_sp_ea_ebene":2,
"netzwerk_fernwartung":1,
@@ -1299,7 +1298,6 @@ class HW():
"sps_simatic_s7_1517_3": 3828, # 790008101
"sps_simatic_s7_1518_4": 5402, # 6ES7518-4AP00-0AB0
"sps_et200_1512sp": 623, # 709000003
"memory_card_256_mb": 250, # 708015093
"memory_card_2_gb": 474, # 708015094
"et200_sp_ea_ebene": 0, # 790009001
"netzwerk_fernwartung": 750, # 790011001
@@ -1436,7 +1434,6 @@ class HW():
"sps_simatic_s7_1517_3": 0,
"sps_simatic_s7_1518_4": 0,
"sps_et200_1512sp": 0,
"memory_card_256_mb": 0,
"memory_card_2_gb": 0,
"et200_sp_ea_ebene":60,
"netzwerk_fernwartung":0,
@@ -1476,7 +1473,6 @@ class HW():
"sps_simatic_s7_1517_3": 0,
"sps_simatic_s7_1518_4": 0,
"sps_et200_1512sp": 0,
"memory_card_256_mb": 0,
"memory_card_2_gb": 0,
"et200_sp_ea_ebene":120,
"netzwerk_fernwartung":0,
@@ -1567,7 +1563,6 @@ class HW():
"sps_simatic_s7_1517_3",
"sps_simatic_s7_1518_4",
"sps_et200_1512sp",
"memory_card_256_mb",
"memory_card_2_gb",
"et200_sp_ea_ebene",
"netzwerk_fernwartung",
@@ -1594,11 +1589,6 @@ class HW():
self._anzahl["sps_simatic_s7_1518_4"] = self.mengen.get("sps_simatic_s7_1518_4", 0)
self._anzahl["sps_et200_1512sp"] = self.mengen.get("sps_et200_1512sp", 0)
self._anzahl["memory_card_256_mb"] = anzahl.get("speicherkarte_fuer_sps2_mb") + \
anzahl.get("sps_simatic_s7_1515_2") + \
anzahl.get("sps_simatic_s7_1517_3") + \
anzahl.get("sps_simatic_s7_1518_4")
self._anzahl["memory_card_2_gb"] = anzahl.get("sps_simatic_s7_1518_4", 0)
self._anzahl["et200_sp_ea_ebene"] = self.mengen.get("et200_sp_ea_ebene", 0)
@@ -2080,7 +2070,6 @@ class HW():
"sps_simatic_s7_1517_3",
"sps_simatic_s7_1518_4",
"sps_et200_1512sp",
"memory_card_256_mb",
"memory_card_2_gb",
"et200_sp_ea_ebene",
"netzwerk_fernwartung",
@@ -2114,7 +2103,6 @@ class HW():
"sps_simatic_s7_1517_3",
"sps_simatic_s7_1518_4",
"sps_et200_1512sp",
"memory_card_256_mb",
"memory_card_2_gb",
"et200_sp_ea_ebene",
"netzwerk_fernwartung",
@@ -2976,7 +2964,6 @@ class TestObjectMethods(unittest.TestCase):
self.assertEqual(hw.anzahl("sps_simatic_s7_1517_3"), 1)
self.assertEqual(hw.anzahl("sps_simatic_s7_1518_4"), 0)
self.assertEqual(hw.anzahl("sps_et200_1512sp"), 0)
self.assertEqual(hw.anzahl("memory_card_256_mb"), 1)
self.assertEqual(hw.anzahl("memory_card_2_gb"), 0)
self.assertEqual(hw.anzahl("et200_sp_ea_ebene"), 2)
self.assertEqual(hw.anzahl("netzwerk_fernwartung"), 1)