Updates for pep-8 compliance. Changed many files cosmetically
Added a file exclusion to tox.ini, and also excluded rule for unused named variables. excluded more things that are system or tox related. Change-Id: I022b72cbe048e3fe1f70e6017038248e6a2e9538
This commit is contained in:
@@ -12,7 +12,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import airflow
|
||||
from airflow.models import DAG
|
||||
from airflow.operators import PlaceholderOperator
|
||||
from airflow.operators.dummy_operator import DummyOperator
|
||||
@@ -48,6 +47,7 @@ def dag_concurrency_check_failure_handler(parent_dag_name, child_dag_name,
|
||||
default_args=args, )
|
||||
|
||||
operator = DummyOperator(
|
||||
task_id='dag_concurrency_check_failure_handler', dag=dag, )
|
||||
task_id='dag_concurrency_check_failure_handler',
|
||||
dag=dag, )
|
||||
|
||||
return dag
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import timedelta
|
||||
|
||||
import airflow
|
||||
from airflow import DAG
|
||||
@@ -26,8 +26,6 @@ from airflow.operators.subdag_operator import SubDagOperator
|
||||
from airflow.operators import DeckhandOperator
|
||||
from airflow.operators import PlaceholderOperator
|
||||
from airflow.utils.trigger_rule import TriggerRule
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
'''
|
||||
deploy_site is the top-level orchestration DAG for deploying a site using the
|
||||
Undercloud platform.
|
||||
@@ -57,30 +55,27 @@ default_args = {
|
||||
dag = DAG(PARENT_DAG_NAME, default_args=default_args, schedule_interval=None)
|
||||
|
||||
concurrency_check = SubDagOperator(
|
||||
subdag=dag_concurrency_check(PARENT_DAG_NAME,
|
||||
DAG_CONCURRENCY_CHECK_DAG_NAME,
|
||||
args=default_args),
|
||||
subdag=dag_concurrency_check(
|
||||
PARENT_DAG_NAME, DAG_CONCURRENCY_CHECK_DAG_NAME, args=default_args),
|
||||
task_id=DAG_CONCURRENCY_CHECK_DAG_NAME,
|
||||
dag=dag, )
|
||||
|
||||
concurrency_check_failure_handler = SubDagOperator(
|
||||
subdag=dag_concurrency_check_failure_handler(
|
||||
PARENT_DAG_NAME, CONCURRENCY_FAILURE_DAG_NAME,
|
||||
args=default_args),
|
||||
PARENT_DAG_NAME, CONCURRENCY_FAILURE_DAG_NAME, args=default_args),
|
||||
task_id=CONCURRENCY_FAILURE_DAG_NAME,
|
||||
trigger_rule=TriggerRule.ONE_FAILED,
|
||||
dag=dag, )
|
||||
|
||||
preflight = SubDagOperator(
|
||||
subdag=all_preflight_checks(PARENT_DAG_NAME, ALL_PREFLIGHT_CHECKS_DAG_NAME,
|
||||
args=default_args),
|
||||
subdag=all_preflight_checks(
|
||||
PARENT_DAG_NAME, ALL_PREFLIGHT_CHECKS_DAG_NAME, args=default_args),
|
||||
task_id=ALL_PREFLIGHT_CHECKS_DAG_NAME,
|
||||
dag=dag, )
|
||||
|
||||
preflight_failure = SubDagOperator(
|
||||
subdag=preflight_failure_handler(PARENT_DAG_NAME,
|
||||
PREFLIGHT_FAILURE_DAG_NAME,
|
||||
args=default_args),
|
||||
subdag=preflight_failure_handler(
|
||||
PARENT_DAG_NAME, PREFLIGHT_FAILURE_DAG_NAME, args=default_args),
|
||||
task_id=PREFLIGHT_FAILURE_DAG_NAME,
|
||||
trigger_rule=TriggerRule.ONE_FAILED,
|
||||
dag=dag, )
|
||||
@@ -89,15 +84,14 @@ get_design_version = DeckhandOperator(
|
||||
task_id=DECKHAND_GET_DESIGN_VERSION, dag=dag)
|
||||
|
||||
validate_site_design = SubDagOperator(
|
||||
subdag=validate_site_design(PARENT_DAG_NAME, VALIDATE_SITE_DESIGN_DAG_NAME,
|
||||
args=default_args),
|
||||
subdag=validate_site_design(
|
||||
PARENT_DAG_NAME, VALIDATE_SITE_DESIGN_DAG_NAME, args=default_args),
|
||||
task_id=VALIDATE_SITE_DESIGN_DAG_NAME,
|
||||
dag=dag)
|
||||
|
||||
validate_site_design_failure = SubDagOperator(
|
||||
subdag=validate_site_design_failure_handler(
|
||||
dag.dag_id, VALIDATION_FAILED_DAG_NAME,
|
||||
args=default_args),
|
||||
dag.dag_id, VALIDATION_FAILED_DAG_NAME, args=default_args),
|
||||
task_id=VALIDATION_FAILED_DAG_NAME,
|
||||
trigger_rule=TriggerRule.ONE_FAILED,
|
||||
dag=dag)
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import airflow
|
||||
from airflow.models import DAG
|
||||
from airflow.operators.subdag_operator import SubDagOperator
|
||||
from airflow.operators.dummy_operator import DummyOperator
|
||||
@@ -52,7 +51,10 @@ def shipyard_preflight_check(parent_dag_name, child_dag_name, args):
|
||||
return dag
|
||||
|
||||
|
||||
def deckhand_preflight_check(parent_dag_name, child_dag_name, args, ):
|
||||
def deckhand_preflight_check(
|
||||
parent_dag_name,
|
||||
child_dag_name,
|
||||
args, ):
|
||||
'''
|
||||
Checks that deckhand is in a good state for
|
||||
the purposes of the Undercloud Platform to proceed with processing
|
||||
@@ -124,29 +126,26 @@ def all_preflight_checks(parent_dag_name, child_dag_name, args):
|
||||
dag=dag, )
|
||||
|
||||
shipyard = SubDagOperator(
|
||||
subdag=shipyard_preflight_check(dag.dag_id,
|
||||
SHIPYARD_PREFLIGHT_CHECK_DAG_NAME,
|
||||
args),
|
||||
subdag=shipyard_preflight_check(
|
||||
dag.dag_id, SHIPYARD_PREFLIGHT_CHECK_DAG_NAME, args),
|
||||
task_id=SHIPYARD_PREFLIGHT_CHECK_DAG_NAME,
|
||||
dag=dag, )
|
||||
|
||||
deckhand = SubDagOperator(
|
||||
subdag=deckhand_preflight_check(dag.dag_id,
|
||||
DECKHAND_PREFLIGHT_CHECK_DAG_NAME,
|
||||
args),
|
||||
subdag=deckhand_preflight_check(
|
||||
dag.dag_id, DECKHAND_PREFLIGHT_CHECK_DAG_NAME, args),
|
||||
task_id=DECKHAND_PREFLIGHT_CHECK_DAG_NAME,
|
||||
dag=dag, )
|
||||
|
||||
drydock = SubDagOperator(
|
||||
subdag=drydock_preflight_check(dag.dag_id,
|
||||
DRYDOCK_PREFLIGHT_CHECK_DAG_NAME,
|
||||
args),
|
||||
DRYDOCK_PREFLIGHT_CHECK_DAG_NAME, args),
|
||||
task_id=DRYDOCK_PREFLIGHT_CHECK_DAG_NAME,
|
||||
dag=dag, )
|
||||
|
||||
armada = SubDagOperator(
|
||||
subdag=armada_preflight_check(
|
||||
dag.dag_id, ARMADA_PREFLIGHT_CHECK_DAG_NAME, args),
|
||||
subdag=armada_preflight_check(dag.dag_id,
|
||||
ARMADA_PREFLIGHT_CHECK_DAG_NAME, args),
|
||||
task_id=ARMADA_PREFLIGHT_CHECK_DAG_NAME,
|
||||
dag=dag, )
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ import airflow
|
||||
from airflow import DAG
|
||||
from airflow.operators import TaskStateOperator
|
||||
from airflow.operators.bash_operator import BashOperator
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import timedelta
|
||||
|
||||
default_args = {
|
||||
'owner': 'airflow',
|
||||
@@ -31,7 +31,9 @@ default_args = {
|
||||
'retry_delay': timedelta(minutes=1),
|
||||
}
|
||||
|
||||
dag = DAG('airflow_task_state', default_args=default_args, schedule_interval=None)
|
||||
dag = DAG('airflow_task_state',
|
||||
default_args=default_args,
|
||||
schedule_interval=None)
|
||||
|
||||
# Get Task State
|
||||
t1 = TaskStateOperator(
|
||||
@@ -44,9 +46,9 @@ t1 = TaskStateOperator(
|
||||
# Use XCOM to Retrieve Task State
|
||||
t2 = BashOperator(
|
||||
task_id='pull',
|
||||
bash_command="echo {{ ti.xcom_pull(task_ids='airflow_task_state', key='task_state') }}",
|
||||
bash_command=("echo {{ ti.xcom_pull(task_ids='airflow_task_state',"
|
||||
" key='task_state') }}"),
|
||||
xcom_push=True,
|
||||
dag=dag)
|
||||
|
||||
t2.set_upstream(t1)
|
||||
|
||||
|
||||
@@ -18,8 +18,7 @@ import airflow
|
||||
from airflow import DAG
|
||||
from airflow.operators import OpenStackOperator
|
||||
from airflow.operators.bash_operator import BashOperator
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from datetime import timedelta
|
||||
|
||||
default_args = {
|
||||
'owner': 'airflow',
|
||||
@@ -35,13 +34,10 @@ default_args = {
|
||||
dag = DAG('openstack_cli', default_args=default_args, schedule_interval=None)
|
||||
|
||||
# print_date
|
||||
t1 = BashOperator(
|
||||
task_id='print_date',
|
||||
bash_command='date',
|
||||
dag=dag)
|
||||
t1 = BashOperator(task_id='print_date', bash_command='date', dag=dag)
|
||||
|
||||
## Note that the openrc.sh file needs to be placed on a volume that can be
|
||||
## accessed by the containers
|
||||
# Note that the openrc.sh file needs to be placed on a volume that can be
|
||||
# accessed by the containers
|
||||
|
||||
# openstack endpoint list
|
||||
t2 = OpenStackOperator(
|
||||
@@ -75,4 +71,3 @@ t2.set_upstream(t1)
|
||||
t3.set_upstream(t1)
|
||||
t4.set_upstream(t1)
|
||||
t5.set_upstream(t1)
|
||||
|
||||
|
||||
@@ -12,11 +12,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import airflow
|
||||
from airflow.models import DAG
|
||||
from airflow.operators.dummy_operator import DummyOperator
|
||||
from airflow.operators.subdag_operator import SubDagOperator
|
||||
from airflow.utils.trigger_rule import TriggerRule
|
||||
from airflow.operators import DeckhandOperator
|
||||
from airflow.operators import PlaceholderOperator
|
||||
|
||||
@@ -47,11 +44,11 @@ def validate_site_design(parent_dag_name, child_dag_name, args):
|
||||
deckhand_validate_docs = DeckhandOperator(
|
||||
task_id='deckhand_validate_site_design', dag=dag)
|
||||
|
||||
#TODO () use the real operator here
|
||||
# TODO () use the real operator here
|
||||
drydock_validate_docs = PlaceholderOperator(
|
||||
task_id='drydock_validate_site_design', dag=dag)
|
||||
|
||||
#TODO () use the real operator here
|
||||
# TODO () use the real operator here
|
||||
armada_validate_docs = PlaceholderOperator(
|
||||
task_id='armada_validate_site_design', dag=dag)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user