Fix extras FKs and related names #3262

timizuoebideri1 · 2023-02-08T16:18:59Z

Closes: #3067

What's Changed

Fix all related names

TODO

Explanation of Change(s)
Added change log fragment(s) (for more information see the documentation)
Attached Screenshots, Payload Example
Unit, Integration Tests
Documentation Updates (when adding/changing features)
Example Plugin Updates (when adding/changing features)
Outline Remaining Work, Constraints from Design

nautobot/core/testing/api.py

nautobot/extras/models/models.py

jathanism

This is beautiful and I love it. I only have a simple question and one comment about a FIXME. But this is good to go IMO.

nautobot/core/testing/api.py

nautobot/extras/models/tags.py

nautobot/docs/installation/upgrading-from-nautobot-v1.md

nautobot/extras/models/jobs.py

nautobot/extras/migrations/0063_rename_model_fields.py

# Conflicts: # nautobot/docs/installation/upgrading-from-nautobot-v1.md # nautobot/extras/api/serializers.py # nautobot/extras/jobs.py # nautobot/extras/models/jobs.py # nautobot/extras/tests/test_api.py # nautobot/extras/tests/test_customfields.py # nautobot/extras/tests/test_views.py # nautobot/extras/views.py

# Conflicts: # nautobot/extras/api/serializers.py # nautobot/extras/tests/test_customfields.py

nautobot/extras/api/views.py

nautobot/extras/jobs.py

nautobot/extras/tests/test_api.py

nautobot/extras/utils.py

nautobot/docs/models/extras/gitrepository.md

nautobot/extras/datasources/git.py

nautobot/extras/models/change_logging.py

nautobot/docs/installation/upgrading-from-nautobot-v1.md

Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>

# Conflicts: # nautobot/docs/installation/upgrading-from-nautobot-v1.md # nautobot/extras/filters/__init__.py # nautobot/extras/tests/test_filters.py

glennmatthews · 2023-02-24T14:13:24Z

  File "/home/runner/work/nautobot/nautobot/nautobot/extras/tests/test_filters.py", line 442, in setUpTestData
    CustomFieldChoice.objects.create(field=fields[num], value=f"Custom Field Choice {num}")

Probably needs to be changed to custom_field=fields[num].

nautobot/docs/installation/upgrading-from-nautobot-v1.md

glennmatthews · 2023-02-24T14:30:04Z

nautobot/extras/api/serializers.py

@@ -918,7 +918,7 @@ def validate(self, data):
 class JobInputSerializer(serializers.Serializer):
    data = serializers.JSONField(required=False, default=dict)
    commit = serializers.BooleanField(required=False, default=None)
-    schedule = NestedScheduledJobSerializer(required=False)
+    scheduled_job = NestedScheduledJobSerializer(required=False)


This change probably needs to be documented somewhere in the upgrading guide (it's not a model serializer per se so it doesn't fit in the current tables, though).

This will also need to be updated in nautobot/docs/additional-features/job-scheduling-and-approvals.md and probably nautobot/docs/additional-features/jobs.md as well.

It seems like a similar change to the _schedule fields in JobMultiPartInputSerializer should also be made and reflected in nautobot.extras.api.views._run_job?

FYI I'm going to revert this particular change and the associated changes to _run_job and the tests in #3368. This is because this isn't actually a nested ScheduledJob object reference, but rather just a set of parameters to the run_job function that we represent in a fashion "similar to" a ScheduledJob.

nautobot/extras/datasources/git.py

Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>

nautobot/docs/installation/upgrading-from-nautobot-v1.md

# Conflicts: # nautobot/docs/installation/upgrading-from-nautobot-v1.md

glennmatthews

One remaining comment, otherwise good to go. :-)

nautobot/extras/datasources/git.py

glennmatthews

If tests pass, !

Renamed all related names

c7af327

timizuoebideri1 requested review from HanlinMiao, glennmatthews, jathanism and gsnider2195 February 8, 2023 16:19

Fix failing test

00421aa

timizuoebideri1 changed the base branch from develop to next February 8, 2023 20:41

timizuoebideri1 commented Feb 8, 2023

View reviewed changes

nautobot/core/testing/api.py Outdated Show resolved Hide resolved

timizuoebideri1 added 2 commits February 8, 2023 22:08

rename ScheduledJob and JobResult job_model field to job

c3c7a30

rename JobResult scheduled_job

bdc3a51

glennmatthews reviewed Feb 8, 2023

View reviewed changes

nautobot/core/testing/api.py Outdated Show resolved Hide resolved

nautobot/extras/models/models.py Outdated Show resolved Hide resolved

timizuoebideri1 added 6 commits February 8, 2023 23:02

rename ConfigContext config_context_schema

38e6b63

rename CustomFieldChoice custom_field

1ef95c8

rename SecretsGroupAssociation secrets_group

cdbc90d

revert rename JobResult.job_model to job

34fc167

Fix failing test

5c7f6e9

add migration

402babd

timizuoebideri1 marked this pull request as ready for review February 9, 2023 20:10

timizuoebideri1 requested a review from glennmatthews February 9, 2023 21:42

jathanism approved these changes Feb 9, 2023

View reviewed changes

nautobot/core/testing/api.py Show resolved Hide resolved

nautobot/extras/models/tags.py Outdated Show resolved Hide resolved

glennmatthews requested changes Feb 10, 2023

View reviewed changes

Git comments adjustments

4ec598b

timizuoebideri1 force-pushed the extras_related_names branch from bd493d9 to 4ec598b Compare February 13, 2023 11:18

timizuoebideri1 added 2 commits February 13, 2023 12:37

fix table

5cf899c

timizuoebideri1 requested a review from glennmatthews February 13, 2023 11:53

timizuoebideri1 added 3 commits February 13, 2023 21:14

revert job back to job_model

0c83ce7

check-schema

979def5

Merge branch 'next' into extras_related_names

818ef68

# Conflicts: # nautobot/extras/api/serializers.py # nautobot/extras/tests/test_customfields.py

timizuoebideri1 commented Feb 15, 2023

View reviewed changes

nautobot/extras/api/views.py Outdated Show resolved Hide resolved

nautobot/extras/jobs.py Outdated Show resolved Hide resolved

nautobot/extras/tests/test_api.py Outdated Show resolved Hide resolved

nautobot/extras/utils.py Outdated Show resolved Hide resolved

timizuoebideri1 requested a review from glennmatthews February 22, 2023 09:36

glennmatthews reviewed Feb 23, 2023

View reviewed changes

nautobot/docs/models/extras/gitrepository.md Show resolved Hide resolved

nautobot/extras/datasources/git.py Outdated Show resolved Hide resolved

nautobot/extras/models/change_logging.py Show resolved Hide resolved

glennmatthews reviewed Feb 23, 2023

View reviewed changes

nautobot/docs/installation/upgrading-from-nautobot-v1.md Outdated Show resolved Hide resolved

nautobot/docs/installation/upgrading-from-nautobot-v1.md Outdated Show resolved Hide resolved

timizuoebideri1 and others added 6 commits February 24, 2023 01:43

Update nautobot/docs/models/extras/gitrepository.md

d93aa7f

Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>

Update nautobot/extras/datasources/git.py

59554bb

Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>

Update nautobot/docs/installation/upgrading-from-nautobot-v1.md

ce0c665

Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>

Update docs

eed0668

Merge branch 'next' into extras_related_names

6967bc0

# Conflicts: # nautobot/docs/installation/upgrading-from-nautobot-v1.md # nautobot/extras/filters/__init__.py # nautobot/extras/tests/test_filters.py

Update docs

015eb47

timizuoebideri1 requested a review from glennmatthews February 24, 2023 09:45

Fix test

b7f4e9c

glennmatthews reviewed Feb 24, 2023

View reviewed changes

Apply suggestions from code review

239d647

Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>

timizuoebideri1 commented Feb 25, 2023

View reviewed changes

nautobot/docs/installation/upgrading-from-nautobot-v1.md Outdated Show resolved Hide resolved

timizuoebideri1 and others added 6 commits February 25, 2023 13:32

Update nautobot/docs/installation/upgrading-from-nautobot-v1.md

57d90e4

Resolve Error

e804336

Merge branch 'next' into extras_related_names

a4448e9

# Conflicts: # nautobot/docs/installation/upgrading-from-nautobot-v1.md

Resolve markdown lint

a4eae16

Fix failing test

0ac123e

Fix integration test case

fe0c45f

timizuoebideri1 requested a review from glennmatthews February 27, 2023 13:45

glennmatthews approved these changes Feb 27, 2023

View reviewed changes

nautobot/extras/datasources/git.py Outdated Show resolved Hide resolved

use job_result.log instead of logger

40ebf35

timizuoebideri1 requested a review from glennmatthews February 27, 2023 20:51

glennmatthews approved these changes Feb 27, 2023

View reviewed changes

timizuoebideri1 merged commit e7d5242 into next Feb 27, 2023

timizuoebideri1 deleted the extras_related_names branch February 27, 2023 22:06

glennmatthews mentioned this pull request Feb 28, 2023

Add polymorphic types for serializer GenericForeignKeys #3368

Merged

6 tasks

bryanculver mentioned this pull request Jul 31, 2023

FK, Related Name Cleanup: extras App #3067

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix extras FKs and related names #3262

Fix extras FKs and related names #3262

timizuoebideri1 commented Feb 8, 2023

jathanism left a comment

glennmatthews commented Feb 24, 2023

glennmatthews Feb 24, 2023

glennmatthews Feb 28, 2023

glennmatthews left a comment

glennmatthews left a comment

Fix extras FKs and related names #3262

Fix extras FKs and related names #3262

Conversation

timizuoebideri1 commented Feb 8, 2023

Closes: #3067

What's Changed

TODO

jathanism left a comment

Choose a reason for hiding this comment

glennmatthews commented Feb 24, 2023

glennmatthews Feb 24, 2023

Choose a reason for hiding this comment

glennmatthews Feb 28, 2023

Choose a reason for hiding this comment

glennmatthews left a comment

Choose a reason for hiding this comment

glennmatthews left a comment

Choose a reason for hiding this comment