Skip to content

Adds Tenancy/Contacts and Contact Groups#94

Closed
fr3nch13 wants to merge 15 commits intoninech:masterfrom
fr3nch13:master
Closed

Adds Tenancy/Contacts and Contact Groups#94
fr3nch13 wants to merge 15 commits intoninech:masterfrom
fr3nch13:master

Conversation

@fr3nch13
Copy link
Copy Markdown
Contributor

You're right, it is pretty trivial to create new Entity definitions.

Anyway, I needed contacts and contact groups, so I figured I'd add them here. As I work through my project, and find other entities that have a relationship with contacts, I'll open another PR to add those relationships.

@fr3nch13 fr3nch13 marked this pull request as draft February 25, 2025 16:32
@fr3nch13 fr3nch13 marked this pull request as ready for review February 27, 2025 20:41
thde
thde previously approved these changes Mar 3, 2025
@thde
Copy link
Copy Markdown
Member

thde commented Mar 3, 2025

@fr3nch13 thank you! Could you rebase your branch? I'll create a release as soon as this one is merged.

@fr3nch13
Copy link
Copy Markdown
Contributor Author

fr3nch13 commented Mar 3, 2025

Done. I'll most likely be adding more entities/relationships in the coming days, but a release with this one would be greatly appreciated!

@thde
Copy link
Copy Markdown
Member

thde commented Mar 6, 2025

It still creates conflicts. So I wait for now.

@fr3nch13
Copy link
Copy Markdown
Contributor Author

fr3nch13 commented Mar 6, 2025

In Github it's showing:

No conflicts with base branch
Changes can be cleanly merged.

Am I missing somethings?

@fr3nch13
Copy link
Copy Markdown
Contributor Author

fr3nch13 commented Mar 6, 2025

From my end, the merge conflict was in the spec/netbox_client_ruby/api/dcim/site_spec.rb because I updated it to use the described_class. But that was the only conflict.

When I rebased, everything was resolved on my end, so I'm not able to see what you're seeing.

@fr3nch13
Copy link
Copy Markdown
Contributor Author

Can we approve this PR? Is there anything else you need from me?

@thde
Copy link
Copy Markdown
Member

thde commented Mar 21, 2025

I already did that two weeks ago, but the branch still had conflicts:

This branch cannot be rebased due to conflicts

I rebased it and merged your changes in #96

@thde thde closed this Mar 21, 2025
@fr3nch13
Copy link
Copy Markdown
Contributor Author

Thank you @thde i really appreciate it. I'm sure I'll have more changes and more PRs. :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants