Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify for scp #52

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Modify for scp #52

wants to merge 4 commits into from

Conversation

mamie1031
Copy link

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
Copy link
Contributor

@andy89923 andy89923 left a comment

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~

internal/sbi/processor/nf_discovery.go Outdated Show resolved Hide resolved
internal/context/context.go Outdated Show resolved Hide resolved
Comment on lines +478 to +479
if nfProfile.NfType == models.NfType_SCP && len(nfProfile.Ipv4Addresses) > 0 {
if len(nfProfile.Ipv4Addresses[0]) > 0 {
Copy link
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
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.

@@ -320,6 +320,10 @@ func (p *Processor) NFDeregisterProcedure(nfInstanceID string) *models.ProblemDe
logger.NfmLog.Warningf("Can not delete NFCertPem file: %v: %v", nfCertPath, removeErr)
}
}
// Set SCP to unable
Copy link
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
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