Sven/aufbau2csv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Umbau SFP nun müssen noch vorhandene Seriennummern berücksichtigt werden

Browse Source
This commit is contained in:
Sven Riwoldt
2024-11-07 13:27:08 +00:00
parent 3d1626076b
commit b48b9ba405
1 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
CMDB2CSV_Aufbaumaster.py
View File

@@ -408,7 +408,7 @@ class MainUI(QDialog): # erbt von QDialog
self.df_cmdb_erw = self.df_cmdb_erw.drop( self.df_cmdb_erw = self.df_cmdb_erw.drop(
columns=['WV-Start', 'WV-Ende', 'CMDB-Status', 'Aufgabe Schritt', 'Filter', 'Waermeabgabe [BTU/h]', columns=['WV-Start', 'WV-Ende', 'CMDB-Status', 'Aufgabe Schritt', 'Filter', 'Waermeabgabe [BTU/h]',
'kalk. Strom [A]']) 'kalk. Strom [A]','ID\nMandanten','ESXi Host\n(beiVM)','Lagerort falls kein\nMontageort verfügbar'] )
self.dfb_erw = self.df_vte_erw.merge(self.df_cmdb_erw,left_index = True, right_index = True, how = 'left') self.dfb_erw = self.df_vte_erw.merge(self.df_cmdb_erw,left_index = True, right_index = True, how = 'left')
@@ -427,33 +427,49 @@ class MainUI(QDialog): # erbt von QDialog
self.dfb_erw = self.dfb_erw.apply(self.korrektur_hersteller, axis=1) self.dfb_erw = self.dfb_erw.apply(self.korrektur_hersteller, axis=1)
# Nun kann die Spalte Gruppierung raus
# CMDB Status Aufbau Rückbau ID Standort Montageort
self.dfb_erw = self.dfb_erw.drop(columns=['Gruppierung','CMDB Status','Aufbau\nRückbau','ID\nStandort','Montageort','belegte\nHE','Slot-Nr.','IP-Adresse\n(Mgmt)','IP-Adresse\n(LOM)','CPU-Kerne','RAM','Version IOS'] )
# Anapssung des Objekttypen alt, hier zu Typ SFP # Anapssung des Objekttypen alt, hier zu Typ SFP
#self.dfb_erw = self.dfb_erw.apply(self.anpassung_Objekttyp, axis=1) #self.dfb_erw = self.dfb_erw.apply(self.anpassung_Objekttyp, axis=1)
#Neu #Neu
self.dfb_erw = self.dfb_erw.apply(self.korrektur_sfp, axis=1) self.dfb_erw = self.dfb_erw.apply(self.korrektur_sfp, axis=1)
ic(self.dfb_erw) ic(self.dfb_erw)
def korrektur_sfp(self,sfp): def korrektur_sfp(self,sfp):
self.configid = sfp['CONFIG-ID'] self.configid = sfp['CONFIG-ID']
if (sfp['Serien-Nr.'] in ('', np.nan, 'bitte nachtragen')) and self.i == 1: if sfp['Serien-Nr.'] in ('', np.nan, 'bitte nachtragen'):
sfp['Serien-Nr.'] = 'dummy' + str(self.i) if self.i == 1:
self.i = self.i + 1 sfp['Serien-Nr.'] = 'dummy' + str(self.i)
self.temp = self.configid sfp['Bezeichner'] = "SFP" + str(self.i)
sfp['Objekttyp (CMDB)']=self.read_dict(self.temp) self.i = self.i + 1
elif (sfp['Serien-Nr.'] in ('', np.nan, 'bitte nachtragen')) and self.i !=1 and self.temp == self.configid: self.temp = self.configid
sfp['Serien-Nr.'] = 'dummy' + str(self.i) sfp['Objekttyp (CMDB)']=self.read_dict(self.temp)
sfp['Objekttyp (CMDB)']=self.read_dict(self.temp) elif self.i !=1 and self.temp == self.configid:
self.i = self.i + 1 sfp['Serien-Nr.'] = 'dummy' + str(self.i)
elif (sfp['Serien-Nr.'] in ('', np.nan, 'bitte nachtragen')) and self.i !=1 and self.temp != self.configid: sfp['Bezeichner'] = "SFP" + str(self.i)
self.i = 1 sfp['Objekttyp (CMDB)']=self.read_dict(self.temp)
sfp['Serien-Nr.'] = 'dummy' + str(self.i) self.i = self.i + 1
self.temp = sfp['CONFIG-ID'] elif self.i !=1 and self.temp != self.configid:
sfp['Objekttyp (CMDB)']=self.read_dict(self.temp) self.i = 1
self.i = self.i + 1 sfp['Serien-Nr.'] = 'dummy' + str(self.i)
sfp['Bezeichner'] = "SFP" + str(self.i)
self.temp = sfp['CONFIG-ID']
sfp['Objekttyp (CMDB)']=self.read_dict(self.temp)
self.i = self.i + 1
else: else:
pass if self.temp != self.configid:
sfp['Bezeichner'] = "SFP" + str(self.i)
sfp['Objekttyp (CMDB)']=self.read_dict(self.temp)
self.i = self.i + 1
self.temp = self.configid
return sfp return sfp