MAAS

Merge ~cgrabowski/maas:move_region_temporal_worker_to_own_package into maas:master

  1. Git
  2. lp:~cgrabowski/maas
  3. move_region_temporal_worker_to_own_package
  4. Merge into master
Proposed by Christian Grabowski
Status: Merged
Approved by: Christian Grabowski
Approved revision: 34af8644b0f58f87a07665c98b29e2090083de5e
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~cgrabowski/maas:move_region_temporal_worker_to_own_package
Merge into: maas:master
Diff against target: 142 lines (+15/-15)
10 files modified
setup.cfg (+2/-1)
src/maastemporalworker/__init__.py (+0/-0)
src/maastemporalworker/temporal_script.py (+3/-3)
src/maastemporalworker/workflow/__init__.py (+0/-0)
src/maastemporalworker/workflow/configure.py (+1/-1)
src/tests/maasserver/conftest.py (+0/-9)
src/tests/maastemporalworker/__init__.py (+0/-0)
src/tests/maastemporalworker/conftest.py (+8/-0)
src/tests/maastemporalworker/workflow/__init__.py (+0/-0)
src/tests/maastemporalworker/workflow/test_configure.py (+1/-1)
Reviewer Review Type Date Requested Status
Jacopo Rota Approve
MAAS Lander Approve
Review via email: mp+461450@code.launchpad.net

Commit message

chore: move maas-temporal-worker to its own package

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b move_region_temporal_worker_to_own_package lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/4752/console
COMMIT: 0c9270d7fab874c249608da3a012842b0cda9628

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b move_region_temporal_worker_to_own_package lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: e33d691778d3c106b5d09e5ecd9fa9e7195f3e3a

review: Approve
Revision history for this message
Jacopo Rota (r00ta) :
review: Needs Fixing
Revision history for this message
Christian Grabowski (cgrabowski) :
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b move_region_temporal_worker_to_own_package lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 34af8644b0f58f87a07665c98b29e2090083de5e

review: Approve
Revision history for this message
Jacopo Rota (r00ta) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/setup.cfg b/setup.cfg
2index 515a8b8..f55530c 100644
3--- a/setup.cfg
4+++ b/setup.cfg
5@@ -35,6 +35,7 @@ include =
6 maasapiserver*
7 maascli*
8 maasserver*
9+ maastemporalworker*
10 metadataserver*
11 provisioningserver*
12
13@@ -47,7 +48,7 @@ console_scripts =
14 maas-rack = provisioningserver.rack_script:run
15 maas-region = maasserver.region_script:run
16 maas-sampledata = maasserver.testing.sampledata.main:main
17- maas-temporal-worker = maasserver.temporal_script:run
18+ maas-temporal-worker = maastemporalworker.temporal_script:run
19 rackd = provisioningserver.server:run
20 regiond = maasserver.server:run
21 test.parallel = maastesting.scripts:run_parallel
22diff --git a/src/maastemporalworker/__init__.py b/src/maastemporalworker/__init__.py
23new file mode 100644
24index 0000000..e69de29
25--- /dev/null
26+++ b/src/maastemporalworker/__init__.py
27diff --git a/src/maasserver/temporal_script.py b/src/maastemporalworker/temporal_script.py
28similarity index 95%
29rename from src/maasserver/temporal_script.py
30rename to src/maastemporalworker/temporal_script.py
31index a9f2be6..89ba588 100644
32--- a/src/maasserver/temporal_script.py
33+++ b/src/maastemporalworker/temporal_script.py
34@@ -4,12 +4,12 @@ import signal
35
36 from maasapiserver.common.db import Database
37 from maasapiserver.settings import read_config
38-from maasserver.workflow.commission import CommissionNWorkflow
39-from maasserver.workflow.configure import (
40+from maastemporalworker.workflow.commission import CommissionNWorkflow
41+from maastemporalworker.workflow.configure import (
42 ConfigureAgentActivity,
43 ConfigureAgentWorkflow,
44 )
45-from maasserver.workflow.deploy import DeployNWorkflow
46+from maastemporalworker.workflow.deploy import DeployNWorkflow
47 from maasserver.workflow.worker import Worker as TemporalWorker
48
49 log = getLogger()
50diff --git a/src/maastemporalworker/workflow/__init__.py b/src/maastemporalworker/workflow/__init__.py
51new file mode 100644
52index 0000000..e69de29
53--- /dev/null
54+++ b/src/maastemporalworker/workflow/__init__.py
55diff --git a/src/maasserver/workflow/activity.py b/src/maastemporalworker/workflow/activity.py
56similarity index 100%
57rename from src/maasserver/workflow/activity.py
58rename to src/maastemporalworker/workflow/activity.py
59diff --git a/src/maasserver/workflow/commission.py b/src/maastemporalworker/workflow/commission.py
60similarity index 100%
61rename from src/maasserver/workflow/commission.py
62rename to src/maastemporalworker/workflow/commission.py
63diff --git a/src/maasserver/workflow/configure.py b/src/maastemporalworker/workflow/configure.py
64similarity index 99%
65rename from src/maasserver/workflow/configure.py
66rename to src/maastemporalworker/workflow/configure.py
67index 04b9f7f..23d2575 100644
68--- a/src/maasserver/workflow/configure.py
69+++ b/src/maastemporalworker/workflow/configure.py
70@@ -17,7 +17,7 @@ from maasapiserver.common.db.tables import (
71 VlanTable,
72 )
73 from maasserver.enum import NODE_TYPE
74-from maasserver.workflow.activity import ActivityBase
75+from maastemporalworker.workflow.activity import ActivityBase
76
77 DEFAULT_CONFIGURE_ACTIVITY_TIMEOUT = timedelta(seconds=10)
78 DEFAULT_CONFIGURE_RETRY_POLICY = RetryPolicy(
79diff --git a/src/maasserver/workflow/deploy.py b/src/maastemporalworker/workflow/deploy.py
80similarity index 100%
81rename from src/maasserver/workflow/deploy.py
82rename to src/maastemporalworker/workflow/deploy.py
83diff --git a/src/tests/maasserver/conftest.py b/src/tests/maasserver/conftest.py
84index 4694186..788723b 100644
85--- a/src/tests/maasserver/conftest.py
86+++ b/src/tests/maasserver/conftest.py
87@@ -17,15 +17,6 @@ from maasserver.vault import (
88 get_region_vault_client_if_enabled,
89 )
90
91-from ..maasapiserver.fixtures.db import db, db_connection, fixture, test_config
92-
93-__all__ = [
94- "db",
95- "db_connection",
96- "fixture",
97- "test_config",
98-]
99-
100
101 @pytest.fixture(autouse=True)
102 def clean_globals(clean_globals):
103diff --git a/src/tests/maastemporalworker/__init__.py b/src/tests/maastemporalworker/__init__.py
104new file mode 100644
105index 0000000..e69de29
106--- /dev/null
107+++ b/src/tests/maastemporalworker/__init__.py
108diff --git a/src/tests/maastemporalworker/conftest.py b/src/tests/maastemporalworker/conftest.py
109new file mode 100644
110index 0000000..d078eab
111--- /dev/null
112+++ b/src/tests/maastemporalworker/conftest.py
113@@ -0,0 +1,8 @@
114+from ..maasapiserver.fixtures.db import db, db_connection, fixture, test_config
115+
116+__all__ = [
117+ "db",
118+ "db_connection",
119+ "fixture",
120+ "test_config",
121+]
122diff --git a/src/tests/maastemporalworker/workflow/__init__.py b/src/tests/maastemporalworker/workflow/__init__.py
123new file mode 100644
124index 0000000..e69de29
125--- /dev/null
126+++ b/src/tests/maastemporalworker/workflow/__init__.py
127diff --git a/src/tests/maasserver/workflow/test_configure.py b/src/tests/maastemporalworker/workflow/test_configure.py
128similarity index 99%
129rename from src/tests/maasserver/workflow/test_configure.py
130rename to src/tests/maastemporalworker/workflow/test_configure.py
131index 048210b..f509d21 100644
132--- a/src/tests/maasserver/workflow/test_configure.py
133+++ b/src/tests/maastemporalworker/workflow/test_configure.py
134@@ -4,7 +4,7 @@ from sqlalchemy.ext.asyncio import AsyncConnection
135
136 from maasapiserver.common.db import Database
137 from maasapiserver.common.db.tables import VlanTable
138-from maasserver.workflow.configure import (
139+from maastemporalworker.workflow.configure import (
140 ConfigureAgentActivity,
141 GetRackControllerVLANsInput,
142 GetRackControllerVLANsResult,

Subscribers

People subscribed via source and target branches