From 4fe2e4f3f45f7559c761a9491f12f2e732bd268d Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 6 Jun 2024 15:56:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=86ssh=E7=94=A8=E6=88=B7=E5=90=8Dm?= =?UTF-8?q?anager=E6=94=B9=E4=B8=BAomcuser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/etc/default/restconf.yaml | 2 +- data2html/data2html.go | 2 +- database/install/ne_host.sql | 28 ++++++++++++++-------------- makefile | 2 +- misc/nehosts | 28 ++++++++++++++-------------- misc/setomc.sh | 4 ++-- restagent/etc/restconf-t.yaml | 1 - 7 files changed, 33 insertions(+), 34 deletions(-) diff --git a/config/etc/default/restconf.yaml b/config/etc/default/restconf.yaml index 27f2c2a0..bd9e658b 100644 --- a/config/etc/default/restconf.yaml +++ b/config/etc/default/restconf.yaml @@ -82,7 +82,7 @@ mml: # NE config ne: - user: manager + user: omcuser etcdir: /usr/local/etc bindir: /usr/local/bin omcdir: /usr/local/omc diff --git a/data2html/data2html.go b/data2html/data2html.go index b437bc1e..8470b87d 100644 --- a/data2html/data2html.go +++ b/data2html/data2html.go @@ -77,7 +77,7 @@ func execTshark(html string, filename string, proto string, port int) { //if err1 != nil { // fmt.Println("write html failed") //}else { - //xsltproc pdml2html.xsl ngap.pdml > /home/manager/ngap.html + //xsltproc pdml2html.xsl ngap.pdml > /home/omcuser/ngap.html command := fmt.Sprintf("xsltproc /usr/local/omc/etc/schema/pdml2html.xsl %s > %s", pdmlFile, html) dest := exec.Command("sh", "-c", command) _, err2 := dest.Output() diff --git a/database/install/ne_host.sql b/database/install/ne_host.sql index 56a6e773..31434276 100644 --- a/database/install/ne_host.sql +++ b/database/install/ne_host.sql @@ -30,34 +30,34 @@ CREATE TABLE `ne_host` ( ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '网元主机表' ROW_FORMAT = DYNAMIC; -- 初始数据对应网元 -INSERT INTO `ne_host` VALUES (1, 'ssh', '1', 'OMC_001_22', '172.16.5.100', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (1, 'ssh', '1', 'OMC_001_22', '172.16.5.100', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (2, 'telnet', '1', 'OMC_001_4100', '172.16.5.100', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (3, 'ssh', '1', 'IMS_001_22', '172.16.5.110', 22, 'manager', '2', '', '', '', '', 'admin', 1708314682742, NULL, 0); +INSERT INTO `ne_host` VALUES (3, 'ssh', '1', 'IMS_001_22', '172.16.5.110', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708314682742, NULL, 0); INSERT INTO `ne_host` VALUES (4, 'telnet', '1', 'IMS_001_4100', '172.16.5.110', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (5, 'ssh', '1', 'AMF_001_22', '172.16.5.120', 22, 'manager', '2', '', '', '', '', 'admin', 1708314682742, NULL, 0); +INSERT INTO `ne_host` VALUES (5, 'ssh', '1', 'AMF_001_22', '172.16.5.120', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708314682742, NULL, 0); INSERT INTO `ne_host` VALUES (6, 'telnet', '1', 'AMF_001_4100', '172.16.5.120', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (7, 'ssh', '1', 'AUSF_001_22', '172.16.5.130', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (7, 'ssh', '1', 'AUSF_001_22', '172.16.5.130', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (8, 'telnet', '1', 'AUSF_001_4100', '172.16.5.130', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (9, 'ssh', '1', 'UDM_001_22', '172.16.5.140', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (9, 'ssh', '1', 'UDM_001_22', '172.16.5.140', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (10, 'telnet', '1', 'UDM_001_4100', '172.16.5.140', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (11, 'ssh', '1', 'SMF_001_22', '172.16.5.150', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (11, 'ssh', '1', 'SMF_001_22', '172.16.5.150', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (12, 'telnet', '1', 'SMF_001_4100', '172.16.5.150', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (13, 'ssh', '1', 'PCF_001_22', '172.16.5.160', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (13, 'ssh', '1', 'PCF_001_22', '172.16.5.160', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (14, 'telnet', '1', 'PCF_001_4100', '172.16.5.160', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (15, 'ssh', '1', 'NSSF_001_22', '172.16.5.170', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (15, 'ssh', '1', 'NSSF_001_22', '172.16.5.170', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (16, 'telnet', '1', 'NSSF_001_4100', '172.16.5.170', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (17, 'ssh', '1', 'NRF_001_22', '172.16.5.180', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (17, 'ssh', '1', 'NRF_001_22', '172.16.5.180', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (18, 'telnet', '1', 'NRF_001_4100', '172.16.5.180', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (19, 'ssh', '1', 'UPF_001_22', '172.16.5.190', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (19, 'ssh', '1', 'UPF_001_22', '172.16.5.190', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (20, 'telnet', '1', 'UPF_001_4100', '172.16.5.190', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (21, 'telnet', '1', 'UPF_001_5002', '172.16.5.190', 5002, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (22, 'ssh', '1', 'LMF_001_22', '172.16.5.200', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (22, 'ssh', '1', 'LMF_001_22', '172.16.5.200', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (23, 'telnet', '1', 'LMF_001_4100', '172.16.5.200', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (24, 'ssh', '1', 'NEF_001_22', '172.16.5.210', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (24, 'ssh', '1', 'NEF_001_22', '172.16.5.210', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (25, 'telnet', '1', 'NEF_001_4100', '172.16.5.210', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (26, 'ssh', '1', 'MME_001_22', '172.16.5.220', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (26, 'ssh', '1', 'MME_001_22', '172.16.5.220', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (27, 'telnet', '1', 'MME_001_4100', '172.16.5.220', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); -INSERT INTO `ne_host` VALUES (28, 'ssh', '1', 'N3IWF_001_22', '172.16.5.230', 22, 'manager', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); +INSERT INTO `ne_host` VALUES (28, 'ssh', '1', 'N3IWF_001_22', '172.16.5.230', 22, 'omcuser', '2', '', '', '', '', 'admin', 1708333292882, NULL, 0); INSERT INTO `ne_host` VALUES (29, 'telnet', '1', 'N3IWF_001_4100', '172.16.5.230', 4100, 'admin', '0', '', '', '', '', 'admin', 1708333292882, NULL, 0); SET FOREIGN_KEY_CHECKS=1; diff --git a/makefile b/makefile index ff67fc5c..05818786 100644 --- a/makefile +++ b/makefile @@ -128,7 +128,7 @@ deb: $(BINNAME) chmod +x $(DebBuildDir)/usr/local/omc/bin/* #sed -i.bak 's/YYYYMMDD/$(shell date +"%Y%m%d")/g' $(DebBuildDir)/DEBIAN/control sed -i 's/YYYYMMDD/$(shell date +"%Y%m%d")/g' $(DebBuildDir)/DEBIAN/control - perl -0777 -i -pe 's/ne:\n user: root/ne:\n user: manager/g' $(DebBuildDir)/usr/local/omc/etc/default/restconf.yaml + perl -0777 -i -pe 's/ne:\n user: root/ne:\n user: omcuser/g' $(DebBuildDir)/usr/local/omc/etc/default/restconf.yaml dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(DebPkgFile) rpm: $(BINNAME) diff --git a/misc/nehosts b/misc/nehosts index d9238441..98507489 100644 --- a/misc/nehosts +++ b/misc/nehosts @@ -1,16 +1,16 @@ # host user password # Example: 192.168.4.133 root password -172.16.5.100 manager admin123 -172.16.5.110 manager admin123 -172.16.5.120 manager admin123 -172.16.5.130 manager admin123 -172.16.5.140 manager admin123 -172.16.5.150 manager admin123 -172.16.5.160 manager admin123 -172.16.5.170 manager admin123 -172.16.5.180 manager admin123 -172.16.5.190 manager admin123 -172.16.5.220 manager admin123 -172.16.5.230 manager admin123 -172.16.5.210 manager admin123 -172.16.5.200 manager admin123 +172.16.5.100 omcuser admin123 +172.16.5.110 omcuser admin123 +172.16.5.120 omcuser admin123 +172.16.5.130 omcuser admin123 +172.16.5.140 omcuser admin123 +172.16.5.150 omcuser admin123 +172.16.5.160 omcuser admin123 +172.16.5.170 omcuser admin123 +172.16.5.180 omcuser admin123 +172.16.5.190 omcuser admin123 +172.16.5.220 omcuser admin123 +172.16.5.230 omcuser admin123 +172.16.5.210 omcuser admin123 +172.16.5.200 omcuser admin123 diff --git a/misc/setomc.sh b/misc/setomc.sh index 3dfa8e08..656855c3 100644 --- a/misc/setomc.sh +++ b/misc/setomc.sh @@ -65,8 +65,8 @@ case "${M_ARG}" in done cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc - perl -0777 -i -pe 's/manager/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml - perl -0777 -i -pe 's/manager/bluearcus/g' ${OMCBinDir}/nehosts + #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml + #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts fi ;; upgrade | upgvue3) diff --git a/restagent/etc/restconf-t.yaml b/restagent/etc/restconf-t.yaml index b7b2d55d..223e2cb5 100644 --- a/restagent/etc/restconf-t.yaml +++ b/restagent/etc/restconf-t.yaml @@ -79,7 +79,6 @@ mml: user: admin password: admin mmlHome: ./mmlhome - upload: /home/manager # NE config ne: