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

Move yaml tempalte to models dir #1842

Merged
merged 3 commits into from
Jun 29, 2019
Merged

Move yaml tempalte to models dir #1842

merged 3 commits into from
Jun 29, 2019

Conversation

yaacov
Copy link
Member

@yaacov yaacov commented Jun 27, 2019

Move kubevirt-plugin models into a separate dir.

Ref:
#1673 (comment)

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 27, 2019
@yaacov
Copy link
Member Author

yaacov commented Jun 27, 2019

This was requested by @vojtechszocs @suomiy .

@mareklibra @vojtechszocs @suomiy @rawagner please review.

atiratree
atiratree reviewed Jun 27, 2019
View reviewed changes
frontend/packages/kubevirt-plugin/src/models/yaml-templates.ts Outdated
@@ -1,7 +1,7 @@
import { Map as ImmutableMap } from 'immutable';

import { TemplateModel } from '@console/internal/models';
import { VirtualMachineModel } from './models';
import { VirtualMachineModel } from '.';

export const yamlTemplates = ImmutableMap()
Copy link
Member

@atiratree atiratree Jun 27, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we go one level deeper into models/templates/ and have a separate file for each template?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make sense to me too ... 👍

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 27, 2019
@spadgett spadgett added this to the v4.2 milestone Jun 27, 2019
@yaacov yaacov force-pushed the move-yaml-templates branch from 225433a to bef2876 Compare June 27, 2019 15:07
atiratree
atiratree reviewed Jun 27, 2019
View reviewed changes
frontend/packages/kubevirt-plugin/src/models/templates/vm-template-yaml-templates.ts Outdated
.setIn(
[TemplateModel, 'vm-template'],
`
export const VmTemplateYAMLTemplates = ImmutableMap().setIn(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please rename to either VirtualMachineTemplate... or VMTemplate...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Nice

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 27, 2019
mareklibra
mareklibra reviewed Jun 28, 2019
View reviewed changes
frontend/packages/kubevirt-plugin/src/models/templates/index.ts Outdated
@@ -0,0 +1,2 @@
export * from './vm-template-yaml-templates';
export * from './vm-yaml-templates';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: as this is already under models/templates, do we need the extra -templates at the end of the filename?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

mareklibra
mareklibra reviewed Jun 28, 2019
View reviewed changes
Copy link
Contributor

@mareklibra mareklibra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left small comment, otherwise lgtm

@yaacov
Copy link
Member Author

yaacov commented Jun 28, 2019

/retest

1 similar comment
@yaacov
Copy link
Member Author

yaacov commented Jun 28, 2019

/retest

@yaacov
Copy link
Member Author

yaacov commented Jun 28, 2019

/test e2e-aws

@atiratree
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 28, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: suomiy, yaacov

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@atiratree
Copy link
Member

/retest

1 similar comment
@atiratree
Copy link
Member

/retest

@yaacov
Copy link
Member Author

yaacov commented Jun 28, 2019

/test e2e-aws

@spadgett
Copy link
Member

/retest

1 similar comment
@alecmerdler
Copy link
Contributor

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit c186f9c into openshift:master Jun 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mareklibra mareklibra mareklibra left review comments

@atiratree atiratree atiratree approved these changes

@jelkosz jelkosz Awaiting requested review from jelkosz

@vojtechszocs vojtechszocs Awaiting requested review from vojtechszocs

Assignees

@atiratree atiratree

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v4.2
Development

Successfully merging this pull request may close these issues.
8 participants
@yaacov @atiratree @openshift-ci-robot @spadgett @alecmerdler @openshift-bot @mareklibra @openshift-merge-robot