Rename oci_model to appr_model

This commit is contained in:
Joseph Schorr 2018-05-23 17:08:00 -04:00
parent f0d4841155
commit 6622f27c93
19 changed files with 222 additions and 171 deletions

View file

@ -26,7 +26,7 @@ from endpoints.webhooks import webhooks
from app import app, config_provider, all_queues, dockerfile_build_queue, notification_queue
from buildtrigger.basehandler import BuildTriggerHandler
from initdb import setup_database_for_testing, finished_database_for_testing
from data import database, model, oci_model
from data import database, model, appr_model
from data.database import RepositoryActionCount, Repository as RepositoryTable
from test.helpers import assert_action_logged
from util.secscan.fake import fake_security_scanner
@ -2153,11 +2153,11 @@ class TestDeleteRepository(ApiTestCase):
# Add some data for the repository, in addition to is already existing images and tags.
repository = model.repository.get_repository(ADMIN_ACCESS_USER, 'complex')
# Add some new-style tags and linked tags.
base_tag = oci_model.tag.create_or_update_tag(repository, 'somebasetag')
base_tag2 = oci_model.tag.create_or_update_tag(repository, 'somebasetag2')
oci_model.tag.create_or_update_tag(repository, 'somelinkedtag', linked_tag=base_tag)
oci_model.tag.create_or_update_tag(repository, 'somelinkedtag2', linked_tag=base_tag2)
# Add some CNR tags and linked tags.
base_tag = appr_model.tag.create_or_update_tag(repository, 'somebasetag')
base_tag2 = appr_model.tag.create_or_update_tag(repository, 'somebasetag2')
appr_model.tag.create_or_update_tag(repository, 'somelinkedtag', linked_tag=base_tag)
appr_model.tag.create_or_update_tag(repository, 'somelinkedtag2', linked_tag=base_tag2)
# Create some access tokens.
access_token = model.token.create_access_token(repository, 'read')