OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

remove RJ

Browse Source
This commit is contained in:
simonzhangsz
2023-09-12 15:55:07 +08:00
parent fc8f63fca6
commit a8aed0d96e
6 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/etc/default/crontask.yaml
View File

@@ -8,12 +8,12 @@ logger:
count: 90 count: 90
omc: omc:
name: BJ_OMC01 name: OMC01
hosturi: http://127.0.0.1:3030 hosturi: http://127.0.0.1:3030
hostno: R001 hostno: A001
province: BJ province: GD
netabbr: HX netabbr: HX
vendor: RJ vendor: -
tasks: tasks:
file: /usr/local/omc/etc/tasks.yaml file: /usr/local/omc/etc/tasks.yaml

6
config/etc/default/restconf.yaml
View File

@@ -69,10 +69,10 @@ omc:
uriPrefix: /api/rest/oam uriPrefix: /api/rest/oam
neType: OMC neType: OMC
neId: 001 neId: 001
rmUID: 1100RJHX1OMC001 rmUID: 4400HX101
neName: OMC neName: OMC
province: BJ province: GD
vendor: RJ vendor: -
dn: 4600 dn: 4600
chk2ne: false chk2ne: false
sn: 13750650 sn: 13750650

6
crontask/etc/crontask.yaml
View File

@@ -8,12 +8,12 @@ logger:
count: 10 count: 10
omc: omc:
name: BJ_OMC01 name: OMC01
hosturi: http://127.0.0.1:3040 hosturi: http://127.0.0.1:3040
hostno: R001 hostno: R001
province: BJ province: GD
netabbr: HX netabbr: HX
vendor: RJ vendor:
tasks: tasks:
file: ./etc/tasks.yaml file: ./etc/tasks.yaml

36
features/ue/ue.go
View File

@@ -30,17 +30,19 @@ type SmfUENum struct {
// SmfUEInfo SMF在线用户信息 // SmfUEInfo SMF在线用户信息
type SmfUEInfo struct { type SmfUEInfo struct {
IMSI string `json:"imsi"` IMSI string `json:"imsi"`
MSISDN string `json:"msisdn"` MSISDN string `json:"msisdn"`
IPv4 []string `json:"ipv4"` PduSessionInfo []struct {
Dnn []string `json:"dnn"` PduSessionID int `json:"pduSessionID"`
Tai []string `json:"tai"` IPv4 string `json:"ipv4"`
PduSessionID []int `json:"pduSessionID"` IPv6 string `json:"ipv6"`
IPv6 []string `json:"ipv6"` Dnn string `json:"dnn"`
SstSD []string `json:"sstSD"` Tai string `json:"tai"`
UpfN3IP []string `json:"upfN3IP"` SstSD string `json:"sstSD"`
RanN3IP []string `json:"ranN3IP"` UpfN3IP string `json:"upfN3IP"`
Activetime []string `json:"activeTime"` RanN3IP string `json:"ranN3IP"`
Activetime string `json:"activeTime"`
} `json:"pduSessionInfo"`
} }
// ImsUEInfo IMS在线用户信息 // ImsUEInfo IMS在线用户信息
@@ -120,7 +122,7 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
log.Trace("neInfo:", neInfo) log.Trace("neInfo:", neInfo)
hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port) hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
requestURI2NF := fmt.Sprintf("%s/%s", hostUri, r.RequestURI) requestURI2NF := fmt.Sprintf("%s%s", hostUri, r.RequestURI)
log.Debug("requestURI2NF:", requestURI2NF) log.Debug("requestURI2NF:", requestURI2NF)
@@ -137,7 +139,7 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
} else { } else {
var response services.DataResponse var response services.DataResponse
_ = json.Unmarshal(resp.Body(), &response) _ = json.Unmarshal(resp.Body(), &response)
services.ResponseWithJson(w, http.StatusOK, response) services.ResponseWithJson(w, resp.StatusCode(), response)
return return
} }
} }
@@ -183,7 +185,7 @@ func GetUENumFromNF(w http.ResponseWriter, r *http.Request) {
log.Trace("neInfo:", neInfo) log.Trace("neInfo:", neInfo)
hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port) hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
requestURI2NF := fmt.Sprintf("%s/%s", hostUri, r.RequestURI) requestURI2NF := fmt.Sprintf("%s%s", hostUri, r.RequestURI)
log.Debug("requestURI2NF:", requestURI2NF) log.Debug("requestURI2NF:", requestURI2NF)
@@ -200,7 +202,7 @@ func GetUENumFromNF(w http.ResponseWriter, r *http.Request) {
} else { } else {
var response services.DataResponse var response services.DataResponse
_ = json.Unmarshal(resp.Body(), &response) _ = json.Unmarshal(resp.Body(), &response)
services.ResponseWithJson(w, http.StatusOK, response) services.ResponseWithJson(w, resp.StatusCode(), response)
return return
} }
} }
@@ -246,7 +248,7 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
log.Trace("neInfo:", neInfo) log.Trace("neInfo:", neInfo)
hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port) hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
requestURI2NF := fmt.Sprintf("%s/%s", hostUri, r.RequestURI) requestURI2NF := fmt.Sprintf("%s%s", hostUri, r.RequestURI)
log.Debug("requestURI2NF:", requestURI2NF) log.Debug("requestURI2NF:", requestURI2NF)
@@ -263,7 +265,7 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
} else { } else {
var response services.DataResponse var response services.DataResponse
_ = json.Unmarshal(resp.Body(), &response) _ = json.Unmarshal(resp.Body(), &response)
services.ResponseWithJson(w, http.StatusOK, response) services.ResponseWithJson(w, resp.StatusCode(), response)
return return
} }
} }

6
restagent/etc/restconf-t.yaml
View File

@@ -53,10 +53,10 @@ omc:
uriPrefix: /api/rest uriPrefix: /api/rest
neType: OMC neType: OMC
neId: 001 neId: 001
rmUID: 1100RJHX1OMC001 rmUID: 4400HX101
neName: OMC neName: OMC
province: BJ province: GD
vendor: RJ vendor: -
dn: 4600 dn: 4600
chk2ne: false chk2ne: false
sn: 13750650 sn: 13750650

6
restagent/etc/restconf.yaml
View File

@@ -69,10 +69,10 @@ omc:
uriPrefix: /api/rest uriPrefix: /api/rest
neType: OMC neType: OMC
neId: 001 neId: 001
rmUID: 1100RJHX1OMC001 rmUID: 4400HX101
neName: OMC neName: OMC
province: BJ province: GD
vendor: RJ vendor: -
dn: 4600 dn: 4600
chk2ne: false chk2ne: false
sn: 13750650 sn: 13750650