Commit 7f55bc23 authored by Ryo Yamashita's avatar Ryo Yamashita Committed by Yas Naoi
Browse files

Issue #3317301 by Ryo Yamashita, yas: Add the SPA form to edit the OpenStack... 

Issue #3317301 by Ryo Yamashita, yas: Add the SPA form to edit the OpenStack launch template in the Cloud module
parent 389169a3

cloud.routing.yml

+26 −1
Changes for cloud.routing.yml: 26 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ entity.cloud_config.geocoder: 


# Cloud launch template REST API

entity.cloud_launch_template.image_options:

  path: '/cloud_dashboard/cloud/{cloud_context}/cloud_launch_template/image_options'

  path: '/cloud_dashboard/{cloud_service_provider}/{cloud_context}/cloud_launch_template/image_options'

  defaults:

    _controller: '\Drupal\cloud\Controller\ApiController::getImageOptions'

  methods: [GET]
@@ -147,6 +147,31 @@ entity.cloud_launch_template.image_options: 
  options:

    perm: 'access dashboard'



entity.security_group_options_default:

  path: '/cloud_dashboard/{cloud_service_provider}/{cloud_context}/security_group_options'

  defaults:

    _controller: '\Drupal\cloud\Controller\ApiController::getSecurityGroupOptions'

    subnet_id: ''

  methods: [GET]

  requirements:

    # Use custom access that will check for cloud_context and the desired permission.

    # Desired permission is passed as an option in the "perm" variable

    _custom_access: '\Drupal\cloud\Controller\CloudConfigController::access'

  options:

    perm: 'access dashboard'



entity.security_group_options:

  path: '/cloud_dashboard/{cloud_service_provider}/{cloud_context}/security_group_options/{subnet_id}'

  defaults:

    _controller: '\Drupal\cloud\Controller\ApiController::getSecurityGroupOptions'

  methods: [GET]

  requirements:

    # Use custom access that will check for cloud_context and the desired permission.

    # Desired permission is passed as an option in the "perm" variable

    _custom_access: '\Drupal\cloud\Controller\CloudConfigController::access'

  options:

    perm: 'access dashboard'



entity.cloud_launch_template.delete:

  path: '/cloud_dashboard/{cloud_service_provider}/{cloud_context}/cloud_launch_template/{entity_id}/delete'

  defaults:

modules/cloud_dashboard/cloud_dashboard/src/constant/templates/form/aws_cloud/ec2/launch_template.ts

+6 −6
Changes for modules/cloud_dashboard/cloud_dashboard/src/constant/templates/form/aws_cloud/ec2/launch_template.ts: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ const AWS_CLOUD_LAUNCH_TEMPLATE: EntityFormTemplate[] = [ 
        keyValueRecords: [

          {

            type: 'select', labelName: 'Image ID', name: 'field_image_id',

            url: '/cloud_dashboard/cloud/{cloud_context}/cloud_launch_template/image_options',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/cloud_launch_template/image_options',

            defaultValue: '', required: true

          },

          {
@@ -67,7 +67,7 @@ const AWS_CLOUD_LAUNCH_TEMPLATE: EntityFormTemplate[] = [ 
        keyValueRecords: [

          {

            type: 'select', labelName: 'Availability Zone', name: 'field_availability_zone',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/availability_zone',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/availability_zones',

            defaultValue: '', required: true

          },

          {
@@ -84,7 +84,7 @@ const AWS_CLOUD_LAUNCH_TEMPLATE: EntityFormTemplate[] = [ 
          },

          {

            type: 'multi-select', labelName: 'Security groups', name: 'security_groups',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/aws_cloud_network_interface/security_group_options/{subnet_id}',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/security_group_options',

            defaultValue: ["{tryNotNull(getValue(aws_cloud_security_group,relationship(field_security_group,drupal_internal__target_id),drupal_internal__id,name),'')}"]

          },

          {
@@ -222,7 +222,7 @@ const AWS_CLOUD_LAUNCH_TEMPLATE: EntityFormTemplate[] = [ 
        keyValueRecords: [

          {

            type: 'select', labelName: 'Image ID', name: 'field_image_id',

            url: '/cloud_dashboard/cloud/{cloud_context}/cloud_launch_template/image_options',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/cloud_launch_template/image_options',

            defaultValue: '', required: true

          },

          {
@@ -241,7 +241,7 @@ const AWS_CLOUD_LAUNCH_TEMPLATE: EntityFormTemplate[] = [ 
        keyValueRecords: [

          {

            type: 'select', labelName: 'Availability Zone', name: 'field_availability_zone',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/availability_zone',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/availability_zones',

            defaultValue: '', required: true

          },

          {
@@ -258,7 +258,7 @@ const AWS_CLOUD_LAUNCH_TEMPLATE: EntityFormTemplate[] = [ 
          },

          {

            type: 'multi-select', labelName: 'Security groups', name: 'security_groups',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/aws_cloud_network_interface/security_group_options/{subnet_id}',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/security_group_options',

            defaultValue: ["{tryNotNull(getValue(aws_cloud_security_group,relationship(field_security_group,drupal_internal__target_id),drupal_internal__id,name),'')}"],

            required: true

          },

modules/cloud_dashboard/cloud_dashboard/src/constant/templates/form/aws_cloud/ec2/network_interface.ts

+1 −1
Changes for modules/cloud_dashboard/cloud_dashboard/src/constant/templates/form/aws_cloud/ec2/network_interface.ts: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ const AWS_CLOUD_NETWORK_INTERFACE_TEMPLATE: EntityFormTemplate[] = [ 
          },

          {

            type: 'multi-select', labelName: 'Security groups', name: 'security_groups',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/aws_cloud_network_interface/security_group_options/{subnet_id}',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/security_group_options/{subnet_id}',

            defaultValue: []

          },

        ]

modules/cloud_dashboard/cloud_dashboard/src/constant/templates/form/aws_cloud/ec2/volume.ts

+1 −1
Changes for modules/cloud_dashboard/cloud_dashboard/src/constant/templates/form/aws_cloud/ec2/volume.ts: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ const AWS_CLOUD_VOLUME_TEMPLATE: EntityFormTemplate[] = [ 
          },

          { type: 'number', labelName: 'IOPS', name: 'iop', defaultValue: 1 },

          { type: 'select', labelName: 'Availability Zone', name: 'availability_zone',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/availability_zone',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/availability_zones',

            defaultValue: '', required: true

          },

          { type: 'default', labelName: 'KMS key ID', name: 'kms_key_id', defaultValue: '' },

modules/cloud_dashboard/cloud_dashboard/src/constant/templates/form/aws_cloud/vpc/subnet.ts

+1 −1
Changes for modules/cloud_dashboard/cloud_dashboard/src/constant/templates/form/aws_cloud/vpc/subnet.ts: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ const AWS_CLOUD_SUBNET_TEMPLATE: EntityFormTemplate[] = [ 
          },

          {

            type: 'select', labelName: 'Availability Zone', name: 'availability_zone',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/availability_zone',

            url: '/cloud_dashboard/aws_cloud/{cloud_context}/availability_zones',

            defaultValue: ''

          },

          { type: 'default', labelName: 'IPv4 CIDR block', name: 'cidr_block', defaultValue: '', required: true },