From 8e9cfd28f84e5ba45f950721c62ed4721b180973 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Fri, 8 Sep 2023 10:16:23 +0800
Subject: [PATCH] redis

---
 config/etc/default/restconf.yaml | 7 +++++++
 restagent/etc/restconf-t.yaml    | 7 +++++++
 tools/cmca/certs/nbi_agent.crt   | 4 ++--
 tools/xsdgen/cm-demo.xml         | 6 +++---
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/config/etc/default/restconf.yaml b/config/etc/default/restconf.yaml
index 95b43647..8e8d60f0 100644
--- a/config/etc/default/restconf.yaml
+++ b/config/etc/default/restconf.yaml
@@ -43,6 +43,13 @@ database:
   name: omc_db
   backup: /usr/local/omc/database
 
+# Redis 缓存数据
+redis:
+  port: 6379
+  host: 127.0.0.1
+  password: ""
+  db: 0
+
 mml:
   port: 4100
   sleep: 200
diff --git a/restagent/etc/restconf-t.yaml b/restagent/etc/restconf-t.yaml
index cd9ef0e3..bcb66aad 100644
--- a/restagent/etc/restconf-t.yaml
+++ b/restagent/etc/restconf-t.yaml
@@ -27,6 +27,13 @@ database:
   name: omc_db
   backup: d:/local.git/ems.agt/restagent/database
 
+# Redis 缓存数据
+redis:
+  port: 6379
+  host: "192.168.4.228"
+  password: ""
+  db: 0
+  
 mml:
   port: 4100
   sleep: 200
diff --git a/tools/cmca/certs/nbi_agent.crt b/tools/cmca/certs/nbi_agent.crt
index 43ce4666..002f9000 100644
--- a/tools/cmca/certs/nbi_agent.crt
+++ b/tools/cmca/certs/nbi_agent.crt
@@ -3,11 +3,11 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=CN, ST=Beijing, L=BJ, O=https://www.ruijie.com.cn
+        Issuer: C=CN, ST=Beijing, L=BJ, O=https://www.xxx.com.cn
         Validity
             Not Before: Aug 12 09:41:13 2023 GMT
             Not After : Nov 20 09:41:13 2023 GMT
-        Subject: C=CN, ST=Beijing, O=https://www.ruijie.com.cn, CN=test
+        Subject: C=CN, ST=Beijing, O=https://www.xxx.com.cn, CN=test
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (2048 bit)
diff --git a/tools/xsdgen/cm-demo.xml b/tools/xsdgen/cm-demo.xml
index b8119e3d..59bf8fd3 100644
--- a/tools/xsdgen/cm-demo.xml
+++ b/tools/xsdgen/cm-demo.xml
@@ -3,7 +3,7 @@
 	<FileHeader>
 		<TimeStamp>2023-05-17 09:57:17</TimeStamp>
 		<TimeZone>UTC+8</TimeZone>
-		<VendorName>Ruijie Network</VendorName>
+		<VendorName>xxx Network</VendorName>
 		<ElementType>SMF</ElementType>
 		<CmVersion>16.1.1</CmVersion>
 	</FileHeader>
@@ -21,7 +21,7 @@
 			<N i="9">Id</N>
 		</FieldName>
 		<FieldValue>
-			<Object rmUID="1000HXSMF001" Dn="DC=www.ruijie.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325" UserLabel="SMF_BJ_JC001" PVFlag="VNF" VMID="kylin10.0-001-SMF" VNFInstanceID="2bdd55b4-9018-41f4-af35-28b6828788">
+			<Object rmUID="1000HXSMF001" Dn="DC=www.xxx.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325" UserLabel="SMF_BJ_JC001" PVFlag="VNF" VMID="kylin10.0-001-SMF" VNFInstanceID="2bdd55b4-9018-41f4-af35-28b6828788">
 				<V i="1">SMF</V>
 				<V i="2">SMF</V>
 				<V i="3">SMF</V>
@@ -32,7 +32,7 @@
 				<V i="8">SMF</V>
 				<V i="9">SMF</V>
 			</Object>
-			<Object rmUID="1000HXSMF002" Dn="DC=www.ruijie.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325" UserLabel="SMF_BJ_JC001" PVFlag="VNF" VMID="kylin10.0-002-SMF" VNFInstanceID="2bdd55b4-9018-41f4-af35-28b6828788">
+			<Object rmUID="1000HXSMF002" Dn="DC=www.xxx.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325" UserLabel="SMF_BJ_JC001" PVFlag="VNF" VMID="kylin10.0-002-SMF" VNFInstanceID="2bdd55b4-9018-41f4-af35-28b6828788">
 				<V i="1">SMF</V>
 				<V i="2">SMF</V>
 				<V i="3">SMF</V>