openstack
/
murano-dashboard
Code Issues Proposed changes

Fixed issue when '# is required' with 1 instance 

Fixed bug #1240107

Change-Id: I15864246eab03a3fb54c8aeab9e3e5211719f64c
This commit is contained in:
Serg Melikyan 2013-11-05 10:43:34 +04:00
parent df77419066
commit 5e38d4ea52
10 changed files with 86 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
muranodashboard/services/ActiveDirectory.yaml
View File

@ -2,9 +2,9 @@ name: Active Directory
type: activeDirectory
description: >-
<strong> The Active Directory Service </strong>
includes one primary and optionally a few secondary
Domain Controllers, with DNS
<strong> The Active Directory Service </strong>
includes one primary and optionally a few secondary
Domain Controllers, with DNS
unitTemplates:
- isMaster: true
@ -26,7 +26,7 @@ forms:
Enter a desired name for a new domain. This name should fit to
DNS Domain Name requirements: it should contain
only A-Z, a-z, 0-9, (.) and (-) and should not end with a dash.
DNS server will be automatically set up on each of the Domain
DNS server will be automatically set up on each of the Domain
Controller instances. Note: Only first 15 characters or characters
before first period is used as NetBIOS name.
attributeNames: [name, domain]
@ -46,8 +46,8 @@ forms:
type: instance
label: Instance Count
description: >-
You can create several Active Directory instances by setting
instance number larger than one. One primary Domain Controller
You can create several Active Directory instances by setting
instance number larger than one. One primary Domain Controller
and a few secondary DCs will be created.
attributeNames: units
minValue: 1
@ -67,12 +67,12 @@ forms:
descriptionTitle: Passwords
description: >-
Windows requires strong password for service administration.
Your password should have at least one letter in each
register, a number and a special character. Password length should be
Your password should have at least one letter in each
register, a number and a special character. Password length should be
a minimum of 7 characters.
Once you forget your password you won't be able to
operate the service until recovery password would be entered. So it's
Once you forget your password you won't be able to
operate the service until recovery password would be entered. So it's
better for Recovery and Administrator password to be different.
- name: recoveryPassword
type: password
@ -83,8 +83,8 @@ forms:
label: Hostname template
description: >-
For your convenience all instance hostnames can be named
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
hostname restrictions.
required: false
regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
@ -95,7 +95,7 @@ forms:
css: {all: [muranodashboard/css/support_placeholder.css]}
validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields:
@ -110,7 +110,7 @@ forms:
type: flavor
label: Instance flavor
description: >-
Select registered in Openstack flavor. Consider that service performance
Select registered in Openstack flavor. Consider that service performance
depends on this parameter.
required: false
- name: osImage
@ -118,7 +118,7 @@ forms:
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and
Select valid image for a service. Image should already be prepared and
registered in glance.
- name: availabilityZone
type: azone

16
muranodashboard/services/AspNetAppFarm.yaml
View File

@ -17,13 +17,13 @@ forms:
hidden: true
attributeNames: false
description: >-
The ASP.NET application will be installed on a number of IIS Web
The ASP.NET application will be installed on a number of IIS Web
Servers, and load balancing will be configured.
- name: name
type: string
label: Service Name
description: >-
Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
underline are allowed.
minLength: 2
maxLength: 64
@ -51,7 +51,7 @@ forms:
label: Domain
required: false
description: >-
Service can be joined to the Active Directory domain. If you want to
Service can be joined to the Active Directory domain. If you want to
create an AD domain create the AD Service first.
helpText: Optional field for a domain to which service can be joined
- name: repository
@ -86,8 +86,8 @@ forms:
label: Hostname template
description: >-
For your convenience all instance hostnames can be named
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
hostname restrictions.
required: false
regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
@ -98,7 +98,7 @@ forms:
css: {all: [muranodashboard/css/support_placeholder.css]}
validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields:
@ -113,7 +113,7 @@ forms:
type: flavor
label: Instance flavor
description: >-
Select registered in Openstack flavor. Consider that service performance
Select registered in Openstack flavor. Consider that service performance
depends on this parameter.
required: false
- name: osImage
@ -121,7 +121,7 @@ forms:
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and
Select valid image for a service. Image should already be prepared and
registered in glance.
- name: availabilityZone
type: azone

5
muranodashboard/services/Demo.yaml
View File

@ -25,11 +25,10 @@ forms:
label: Instance Count
description: >-
Murano can provision more then one instance of the service at a time.
For a demo scenario only 2 instances are allowed.
attributeNames: units
minValue: 1
maxValue: 2
initial: 2
initial: 1
helpText: Enter 1 and 2 value
- name: unitNamingPattern
type: string
@ -48,7 +47,7 @@ forms:
css: {all: [muranodashboard/css/support_placeholder.css]}
validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields:

18
muranodashboard/services/WebServerFarm.yaml
View File

@ -20,7 +20,7 @@ forms:
type: string
label: Service Name
description: >-
Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
underline are allowed.
minLength: 2
maxLength: 64
@ -40,15 +40,15 @@ forms:
descriptionTitle: Passwords
description: >-
Windows requires strong password for service administration.
Your password should have at least one letter in each
register, a number and a special character. Password length should be
Your password should have at least one letter in each
register, a number and a special character. Password length should be
a minimum of 7 characters.
- name: domain
type: domain
label: Domain
required: false
description: >-
Service can be joined to the Active Directory domain. If you want to
Service can be joined to the Active Directory domain. If you want to
create an AD domain create the AD Service first.
helpText: Optional field for a domain to which service can be joined
- name: dcInstances
@ -73,8 +73,8 @@ forms:
label: Hostname template
description: >-
For your convenience all instance hostnames can be named
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
hostname restrictions.
required: false
regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
@ -85,7 +85,7 @@ forms:
css: {all: [muranodashboard/css/support_placeholder.css]}
validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields:
@ -100,7 +100,7 @@ forms:
type: flavor
label: Instance flavor
description: >-
Select registered in Openstack flavor. Consider that service performance
Select registered in Openstack flavor. Consider that service performance
depends on this parameter.
required: false
- name: osImage
@ -108,7 +108,7 @@ forms:
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and
Select valid image for a service. Image should already be prepared and
registered in glance.
- name: availabilityZone
type: azone

32
muranodashboard/services3/ActiveDirectory.yaml
View File

@ -2,9 +2,9 @@ name: Active Directory
type: activeDirectory
description: >-
<strong> The Active Directory Service </strong>
includes one primary and optionally a few secondary
Domain Controllers, with DNS
<strong> The Active Directory Service </strong>
includes one primary and optionally a few secondary
Domain Controllers, with DNS
unitTemplates:
- isMaster: true
@ -26,7 +26,7 @@ forms:
Enter a desired name for a new domain. This name should fit to
DNS Domain Name requirements: it should contain
only A-Z, a-z, 0-9, (.) and (-) and should not end with a dash.
DNS server will be automatically set up on each of the Domain
DNS server will be automatically set up on each of the Domain
Controller instances. Note: Only first 15 characters or characters
before first period is used as NetBIOS name.
attributeNames: [name, domain]
@ -46,8 +46,8 @@ forms:
type: instance
label: Instance Count
description: >-
You can create several Active Directory instances by setting
instance number larger than one. One primary Domain Controller
You can create several Active Directory instances by setting
instance number larger than one. One primary Domain Controller
and a few secondary DCs will be created.
attributeNames: units
minValue: 1
@ -67,12 +67,12 @@ forms:
descriptionTitle: Passwords
description: >-
Windows requires strong password for service administration.
Your password should have at least one letter in each
register, a number and a special character. Password length should be
Your password should have at least one letter in each
register, a number and a special character. Password length should be
a minimum of 7 characters.
Once you forget your password you won't be able to
operate the service until recovery password would be entered. So it's
Once you forget your password you won't be able to
operate the service until recovery password would be entered. So it's
better for Recovery and Administrator password to be different.
- name: recoveryPassword
type: password
@ -83,8 +83,8 @@ forms:
label: Hostname template
description: >-
For your convenience all instance hostnames can be named
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
hostname restrictions.
required: false
regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
@ -95,7 +95,7 @@ forms:
css: {all: [muranodashboard/css/support_placeholder.css]}
validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields:
@ -110,7 +110,7 @@ forms:
type: flavor
label: Instance flavor
description: >-
Select registered in Openstack flavor. Consider that service performance
Select registered in Openstack flavor. Consider that service performance
depends on this parameter.
required: false
- name: osImage
@ -118,7 +118,7 @@ forms:
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and
Select valid image for a service. Image should already be prepared and
registered in glance.
- name: availabilityZone
type: azone

16
muranodashboard/services3/AspNetAppFarm.yaml
View File

@ -17,13 +17,13 @@ forms:
hidden: true
attributeNames: false
description: >-
The ASP.NET application will be installed on a number of IIS Web
The ASP.NET application will be installed on a number of IIS Web
Servers, and load balancing will be configured.
- name: name
type: string
label: Service Name
description: >-
Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
underline are allowed.
minLength: 2
maxLength: 64
@ -51,7 +51,7 @@ forms:
label: Domain
required: false
description: >-
Service can be joined to the Active Directory domain. If you want to
Service can be joined to the Active Directory domain. If you want to
create an AD domain create the AD Service first.
helpText: Optional field for a domain to which service can be joined
- name: repository
@ -86,8 +86,8 @@ forms:
label: Hostname template
description: >-
For your convenience all instance hostnames can be named
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
hostname restrictions.
required: false
regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
@ -98,7 +98,7 @@ forms:
css: {all: [muranodashboard/css/support_placeholder.css]}
validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields:
@ -113,7 +113,7 @@ forms:
type: flavor
label: Instance flavor
description: >-
Select registered in Openstack flavor. Consider that service performance
Select registered in Openstack flavor. Consider that service performance
depends on this parameter.
required: false
- name: osImage
@ -121,7 +121,7 @@ forms:
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and
Select valid image for a service. Image should already be prepared and
registered in glance.
- name: availabilityZone
type: azone

2
muranodashboard/services3/Demo.yaml
View File

@ -48,7 +48,7 @@ forms:
css: {all: [muranodashboard/css/support_placeholder.css]}
validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields:

18
muranodashboard/services3/WebServerFarm.yaml
View File

@ -20,7 +20,7 @@ forms:
type: string
label: Service Name
description: >-
Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
Enter a desired name for a service. Just A-Z, a-z, 0-9, dash and
underline are allowed.
minLength: 2
maxLength: 64
@ -40,15 +40,15 @@ forms:
descriptionTitle: Passwords
description: >-
Windows requires strong password for service administration.
Your password should have at least one letter in each
register, a number and a special character. Password length should be
Your password should have at least one letter in each
register, a number and a special character. Password length should be
a minimum of 7 characters.
- name: domain
type: domain
label: Domain
required: false
description: >-
Service can be joined to the Active Directory domain. If you want to
Service can be joined to the Active Directory domain. If you want to
create an AD domain create the AD Service first.
helpText: Optional field for a domain to which service can be joined
- name: dcInstances
@ -73,8 +73,8 @@ forms:
label: Hostname template
description: >-
For your convenience all instance hostnames can be named
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
hostname restrictions.
required: false
regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
@ -85,7 +85,7 @@ forms:
css: {all: [muranodashboard/css/support_placeholder.css]}
validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields:
@ -100,7 +100,7 @@ forms:
type: flavor
label: Instance flavor
description: >-
Select registered in Openstack flavor. Consider that service performance
Select registered in Openstack flavor. Consider that service performance
depends on this parameter.
required: false
- name: osImage
@ -108,7 +108,7 @@ forms:
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and
Select valid image for a service. Image should already be prepared and
registered in glance.
- name: availabilityZone
type: azone

32
muranodashboard/services5/ActiveDirectory.yaml
View File

@ -2,9 +2,9 @@ name: Active Directory
type: activeDirectory
description: >-
<strong> The Active Directory Service </strong>
includes one primary and optionally a few secondary
Domain Controllers, with DNS
<strong> The Active Directory Service </strong>
includes one primary and optionally a few secondary
Domain Controllers, with DNS
unitTemplates:
- isMaster: true
@ -26,7 +26,7 @@ forms:
Enter a desired name for a new domain. This name should fit to
DNS Domain Name requirements: it should contain
only A-Z, a-z, 0-9, (.) and (-) and should not end with a dash.
DNS server will be automatically set up on each of the Domain
DNS server will be automatically set up on each of the Domain
Controller instances. Note: Only first 15 characters or characters
before first period is used as NetBIOS name.
attributeNames: [name, domain]
@ -46,8 +46,8 @@ forms:
type: instance
label: Instance Count
description: >-
You can create several Active Directory instances by setting
instance number larger than one. One primary Domain Controller
You can create several Active Directory instances by setting
instance number larger than one. One primary Domain Controller
and a few secondary DCs will be created.
attributeNames: units
minValue: 1
@ -67,12 +67,12 @@ forms:
descriptionTitle: Passwords
description: >-
Windows requires strong password for service administration.
Your password should have at least one letter in each
register, a number and a special character. Password length should be
Your password should have at least one letter in each
register, a number and a special character. Password length should be
a minimum of 7 characters.
Once you forget your password you won't be able to
operate the service until recovery password would be entered. So it's
Once you forget your password you won't be able to
operate the service until recovery password would be entered. So it's
better for Recovery and Administrator password to be different.
- name: recoveryPassword
type: password
@ -83,8 +83,8 @@ forms:
label: Hostname template
description: >-
For your convenience all instance hostnames can be named
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
in the same way. Enter a name and use # character for incrementation.
For example, host# turns into host1, host2, etc. Please follow Windows
hostname restrictions.
required: false
regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$'
@ -95,7 +95,7 @@ forms:
css: {all: [muranodashboard/css/support_placeholder.css]}
validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields:
@ -110,7 +110,7 @@ forms:
type: flavor
label: Instance flavor
description: >-
Select registered in Openstack flavor. Consider that service performance
Select registered in Openstack flavor. Consider that service performance
depends on this parameter.
required: false
- name: osImage
@ -118,7 +118,7 @@ forms:
imageType: windows
label: Instance image
description: >-
Select valid image for a service. Image should already be prepared and
Select valid image for a service. Image should already be prepared and
registered in glance.
- name: availabilityZone
type: azone

2
muranodashboard/services5/Demo.yaml
View File

@ -48,7 +48,7 @@ forms:
css: {all: [muranodashboard/css/support_placeholder.css]}
validators:
# if unitNamingPattern is given and dcInstances > 1, then '#' should occur in unitNamingPattern
- expr: {YAQL: not $.serviceConfiguration.unitNamingPattern.bool() or ('#' in $.serviceConfiguration.unitNamingPattern)}
- expr: {YAQL: $.serviceConfiguration.dcInstances < 2 or not $.serviceConfiguration.unitNamingPattern.bool() or '#' in $.serviceConfiguration.unitNamingPattern}
message: Incrementation symbol "#" is required in the Hostname template
- instanceConfiguration:
fields: