Skip to content

Modify for scp#52

Draft
mamie1031 wants to merge 4 commits into
free5gc:mainfrom
mamie1031:modify-for-scp
Draft

Modify for scp#52
mamie1031 wants to merge 4 commits into
free5gc:mainfrom
mamie1031:modify-for-scp

Conversation

@mamie1031

Copy link
Copy Markdown

I have revised my project and the way of merging. If there are any issues, let me know!🙌

@andy89923 andy89923 changed the base branch from master to main January 22, 2025 17:05
@andy89923 andy89923 self-requested a review January 22, 2025 17:07

@andy89923 andy89923 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @mamie1031 ,

Thanks for the PR!
Please fix the linter error, thanks~

Comment thread internal/sbi/processor/nf_discovery.go Outdated
Comment thread internal/context/context.go Outdated
Comment thread internal/sbi/processor/nf_management.go Outdated
Comment on lines +478 to +479
if nfProfile.NfType == models.NfType_SCP && len(nfProfile.Ipv4Addresses) > 0 {
if len(nfProfile.Ipv4Addresses[0]) > 0 {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two conditions can be merged to one if.

Comment on lines +515 to +516
if nfProfile.NfType == models.NfType_SCP && len(nfProfile.Ipv4Addresses) > 0 {
if len(nfProfile.Ipv4Addresses[0]) > 0 {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two conditions can be merged into one if.

logger.NfmLog.Warningf("Can not delete NFCertPem file: %v: %v", nfCertPath, removeErr)
}
}
// Set SCP to unable

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Set SCP to unable
// Set SCP to disable

Comment on lines +481 to +482
ScpIp := nfProfile.Ipv4Addresses[0]
ScpUri := "http://" + ScpIp + ":8000" // default port

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check ScpInfo in NFProfile.

@mamie1031 mamie1031 closed this Feb 7, 2025
@mamie1031 mamie1031 reopened this Feb 7, 2025
@mamie1031 mamie1031 marked this pull request as draft February 7, 2025 05:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants