diff --git a/CMDB2CSV_Aufbaumaster.py b/CMDB2CSV_Aufbaumaster.py index bd959b67..efeb414f 100755 --- a/CMDB2CSV_Aufbaumaster.py +++ b/CMDB2CSV_Aufbaumaster.py @@ -408,7 +408,7 @@ class MainUI(QDialog): # erbt von QDialog self.df_cmdb_erw = self.df_cmdb_erw.drop( 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') @@ -427,33 +427,49 @@ class MainUI(QDialog): # erbt von QDialog 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 #self.dfb_erw = self.dfb_erw.apply(self.anpassung_Objekttyp, axis=1) #Neu self.dfb_erw = self.dfb_erw.apply(self.korrektur_sfp, axis=1) + ic(self.dfb_erw) def korrektur_sfp(self,sfp): self.configid = sfp['CONFIG-ID'] - if (sfp['Serien-Nr.'] in ('', np.nan, 'bitte nachtragen')) and self.i == 1: - sfp['Serien-Nr.'] = 'dummy' + str(self.i) - self.i = self.i + 1 - self.temp = self.configid - sfp['Objekttyp (CMDB)']=self.read_dict(self.temp) - elif (sfp['Serien-Nr.'] in ('', np.nan, 'bitte nachtragen')) and self.i !=1 and self.temp == self.configid: - sfp['Serien-Nr.'] = 'dummy' + 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.i = 1 - sfp['Serien-Nr.'] = 'dummy' + str(self.i) - self.temp = sfp['CONFIG-ID'] - sfp['Objekttyp (CMDB)']=self.read_dict(self.temp) - self.i = self.i + 1 + if sfp['Serien-Nr.'] in ('', np.nan, 'bitte nachtragen'): + if self.i == 1: + sfp['Serien-Nr.'] = 'dummy' + str(self.i) + sfp['Bezeichner'] = "SFP" + str(self.i) + self.i = self.i + 1 + self.temp = self.configid + sfp['Objekttyp (CMDB)']=self.read_dict(self.temp) + elif self.i !=1 and self.temp == self.configid: + sfp['Serien-Nr.'] = 'dummy' + str(self.i) + sfp['Bezeichner'] = "SFP" + str(self.i) + sfp['Objekttyp (CMDB)']=self.read_dict(self.temp) + self.i = self.i + 1 + elif self.i !=1 and self.temp != self.configid: + 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: - 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