Commit ab712867 authored by Takumaru Sekine's avatar Takumaru Sekine Committed by Yas Naoi
Browse files

Issue #3285338 by sekinet, Ryo Yamashita, yas: Add the function to edit... 

Issue #3285338 by sekinet, Ryo Yamashita, yas: Add the function to edit Openstack Network Interface in the SPA
parent 0b9c32f4

modules/cloud_dashboard/cloud_dashboard/src/constant/form_template/entity_form_template.ts

+1 −0
Changes for modules/cloud_dashboard/cloud_dashboard/src/constant/form_template/entity_form_template.ts: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import K8S_POD_TEMPLATE from 'constant/form_template/k8s/pod'; 
import K8S_SCHEDULE_TEMPLATE from 'constant/form_template/k8s/schedule';

import OPENSTACK_IMAGE_TEMPLATE from 'constant/form_template/openstack/image';

import OPENSTACK_INSTANCE_TEMPLATE from 'constant/form_template/openstack/instance';

import OPENSTACK_FLOATING_IP_TEMPLATE from 'constant/form_template/openstack/floating_ip';

import OPENSTACK_KEY_PAIR_TEMPLATE from 'constant/form_template/openstack/key_pair';

import OPENSTACK_NETWORK_INTERFACE_TEMPLATE from 'constant/form_template/openstack/network_interface';

import VMWARE_VM_TEMPLATE from 'constant/form_template/vmware/vm';

modules/cloud_dashboard/cloud_dashboard/src/constant/form_template/openstack/network_interface.ts

+2 −2
Changes for modules/cloud_dashboard/cloud_dashboard/src/constant/form_template/openstack/network_interface.ts: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ const OPENSTACK_NETWORK_INTERFACE_TEMPLATE: EntityFormTemplate[] = [ 
        type: 'panel',

        panelName: 'Network interface',

        keyValueRecords: [

          { type: 'default', labelName: 'Network interface name', name: 'name', defaultValue: '', readOnly: true },

          { type: 'default', labelName: 'Description', name: 'description', defaultValue: '', readOnly: true },

          { type: 'default', labelName: 'Network interface name', name: 'name', defaultValue: '', required: true },

          { type: 'default', labelName: 'Description', name: 'description', defaultValue: '' },

          { type: 'default', labelName: 'Network interface ID', name: 'network_interface_id', defaultValue: '', readOnly: true },

          { type: 'default', labelName: 'Instance ID', name: 'instance_id', defaultValue: '', readOnly: true },

          { type: 'default', labelName: 'Allocation ID', name: 'allocation_id', defaultValue: '', readOnly: true },

modules/cloud_service_providers/openstack/openstack.routing.yml

+14 −0
Changes for modules/cloud_service_providers/openstack/openstack.routing.yml: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -641,6 +641,20 @@ entity.openstack_network_interface.delete: 
  options:

      perm: 'delete any openstack network interface+delete own openstack network interface'



entity.openstack_network_interface.edit:

  path: '/cloud_dashboard/openstack/{cloud_context}/openstack_network_interface/{entity_id}/edit'

  defaults:

    _controller: '\Drupal\openstack\Controller\ApiController::operateEntity'

    entity_type_id: openstack_network_interface

    command: edit

  methods: [POST]

  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: 'edit any openstack network interface+edit own openstack network interface'



entity.openstack_floating_ip.create:

  path: '/cloud_dashboard/openstack/{cloud_context}/openstack_floating_ip/create'

  defaults:

modules/cloud_service_providers/openstack/src/Controller/ApiController.php

+6 −0
Changes for modules/cloud_service_providers/openstack/src/Controller/ApiController.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -574,6 +574,12 @@ class ApiController extends ControllerBase implements ApiControllerInterface { 
        $method_name = 'deleteOpenStackNetworkInterface';

        break;



      case 'edit_openstack_network_interface':

        $original_entity->setName($request->get('name', ''));

        $original_entity->setDescription($request->get('description', ''));

        $method_name = 'editOpenStackNetworkInterface';

        break;



      case 'create_openstack_floating_ip':

        $original_entity->setName($request->get('name', ''));

        $form_state->setValue('floating_network_id', $request->get('floating_network_id', ''));

modules/cloud_service_providers/openstack/src/Form/OpenStackNetworkInterfaceEditForm.php

+16 −24
Changes for modules/cloud_service_providers/openstack/src/Form/OpenStackNetworkInterfaceEditForm.php: 16 added lines, 24 removed lines.
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
namespace Drupal\openstack\Form;



use Drupal\openstack\Service\OpenStackServiceFactoryInterface;

use Drupal\openstack\Service\Rest\OpenStackService as OpenStackRestService;

use Drupal\aws_cloud\Form\Ec2\NetworkInterfaceEditForm;

use Drupal\aws_cloud\Service\Ec2\Ec2ServiceInterface;

use Drupal\cloud\Plugin\cloud\config\CloudConfigPluginManagerInterface;
@@ -21,6 +20,7 @@ use Drupal\Core\Render\Renderer; 
use Drupal\Core\Routing\RouteMatchInterface;

use Drupal\Core\Session\AccountInterface;

use Drupal\cloud\Service\CloudServiceInterface;

use Drupal\openstack\Service\OpenStackOperationsServiceInterface;

use Symfony\Component\DependencyInjection\ContainerInterface;



/**
@@ -37,6 +37,13 @@ class OpenStackNetworkInterfaceEditForm extends NetworkInterfaceEditForm { 
   */

  protected $openStackServiceFactory;



  /**

   * The OpenStack operations Service.

   *

   * @var \Drupal\openstack\Service\OpenStackOperationsServiceInterface

   */

  protected $openStackOperationsService;



  /**

   * OpenStackFloatingIpEditForm constructor.

   *
@@ -72,6 +79,8 @@ class OpenStackNetworkInterfaceEditForm extends NetworkInterfaceEditForm { 
   *   The general renderer.

   * @param \Drupal\cloud\Service\CloudServiceInterface $cloud_service

   *   The Cloud service.

   * @param \Drupal\openstack\Service\OpenStackOperationsServiceInterface $openstack_operations_service

   *   The OpenStack Operations service.

   */

  public function __construct(OpenStackServiceFactoryInterface $openstack_service_factory,

                              Ec2ServiceInterface $ec2_service,
@@ -88,7 +97,8 @@ class OpenStackNetworkInterfaceEditForm extends NetworkInterfaceEditForm { 
                              RouteMatchInterface $route_match,

                              DateFormatterInterface $date_formatter,

                              Renderer $renderer,

                              CloudServiceInterface $cloud_service) {

                              CloudServiceInterface $cloud_service,

                              OpenStackOperationsServiceInterface $openstack_operations_service) {



    parent::__construct(

      $ec2_service,
@@ -109,6 +119,7 @@ class OpenStackNetworkInterfaceEditForm extends NetworkInterfaceEditForm { 
    );



    $this->openStackServiceFactory = $openstack_service_factory;

    $this->openStackOperationsService = $openstack_operations_service;

  }



  /**
@@ -137,7 +148,8 @@ class OpenStackNetworkInterfaceEditForm extends NetworkInterfaceEditForm { 
      $container->get('current_route_match'),

      $container->get('date.formatter'),

      $container->get('renderer'),

      $container->get('cloud')

      $container->get('cloud'),

      $container->get('openstack.operations')

    );

  }
@@ -172,27 +184,7 @@ class OpenStackNetworkInterfaceEditForm extends NetworkInterfaceEditForm { 
   *   The current form state.

   */

  public function save(array $form, FormStateInterface $form_state): void {

    $entity = $this->entity;

    // Switch OpenStack EC2 or REST service based on $entity->getCloudContext().

    $this->ec2Service = $this->openStackServiceFactory->get($entity->getCloudContext());

    parent::save($form, $form_state);



    // Update OpenStack REST NetworkInterfaces.

    if ($this->ec2Service instanceof OpenStackRestService) {

      // Delete old tags.

      $this->ec2Service->deleteTags(

        [

          'NetworkInterfaceId' => $entity->getNetworkInterfaceId(),

          'EntityType'         => $entity->getEntityTypeId(),

        ]);



      $this->updateNameAndCreatedByTags($entity, $entity->getNetworkInterfaceId());

      $this->ec2Service->updateNetworkInterface([

        'NetworkInterfaceId' => $entity->getNetworkInterfaceId(),

        'Name' => $entity->getName(),

        'Description' => $entity->getDescription(),

      ]);

    }

    $this->openStackOperationsService->editOpenStackNetworkInterface($this->entity, $form, $form_state);

  }



}