Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NAS-130170 / 24.10 / Fix node_ip feature #33

Merged
merged 1 commit into from
Jul 23, 2024
Merged

NAS-130170 / 24.10 / Fix node_ip feature #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions apps_schema/features/node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
from apps_schema.attrs import IntegerSchema, StringSchema
from apps_schema.attrs import StringSchema

from .base import BaseFeature


class DefinitionNodeIPFeature(BaseFeature):

NAME = 'definitions/node_ip'
NAME = 'definitions/node_bind_ip'
VALID_SCHEMAS = [StringSchema]


class ValidationNodePortFeature(BaseFeature):

NAME = 'validations/node_port'
VALID_SCHEMAS = [IntegerSchema]
3 changes: 1 addition & 2 deletions catalog_reader/app_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ def get_app_details_base(retrieve_complete_item_keys: bool = True) -> dict:

def get_default_questions_context() -> dict:
return {
'nic_choices': [],
'gpus': {},
'timezones': {'Asia/Saigon': 'Asia/Saigon', 'Asia/Damascus': 'Asia/Damascus'},
'node_ip': '192.168.0.10',
'ip_choices': {'192.168.0.10': '192.168.0.10', '0.0.0.0': '0.0.0.0'},
'certificates': [],
'certificate_authorities': [],
'system.general.config': {'timezone': 'America/Los_Angeles'},
Expand Down
7 changes: 5 additions & 2 deletions catalog_reader/questions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,11 @@ def normalize_question(question: dict, version_data: dict, context: dict) -> Non
'enum': [{'value': t, 'description': f'{t!r} timezone'} for t in sorted(context['timezones'])],
'default': context['system.general.config']['timezone']
})
elif ref == 'definitions/nodeIP':
data['default'] = context['node_ip']
elif ref == 'definitions/node_bind_ip':
data.update({
'default': '0.0.0.0',
'enum': [{'value': i, 'description': f'{i!r} IP Address'} for i in context['ip_choices']],
})
elif ref == 'definitions/certificate':
get_cert_ca_options(schema, data, {'value': None, 'description': 'No Certificate'})
data['enum'] += [
Expand Down
Loading