From 0c5c09066b6f9f33b929a98fa2785eedcb87a7bb Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 15 Mar 2018 14:23:29 +0800
Subject: [PATCH] Switch acceptance test to use integration classes

Change-Id: I96b482bfb371daa31f7a32aa6d3abb6e110c7b03
---
 spec/acceptance/basic_neutron_spec.rb | 74 +--------------------------
 1 file changed, 1 insertion(+), 73 deletions(-)

diff --git a/spec/acceptance/basic_neutron_spec.rb b/spec/acceptance/basic_neutron_spec.rb
index fedd396e7..f3880d120 100644
--- a/spec/acceptance/basic_neutron_spec.rb
+++ b/spec/acceptance/basic_neutron_spec.rb
@@ -11,79 +11,7 @@ describe 'basic neutron' do
       include ::openstack_integration::rabbitmq
       include ::openstack_integration::mysql
       include ::openstack_integration::keystone
-
-      rabbitmq_user { 'neutron':
-        admin    => true,
-        password => 'an_even_bigger_secret',
-        provider => 'rabbitmqctl',
-        require  => Class['rabbitmq'],
-      }
-
-      rabbitmq_user_permissions { 'neutron@/':
-        configure_permission => '.*',
-        write_permission     => '.*',
-        read_permission      => '.*',
-        provider             => 'rabbitmqctl',
-        require              => Class['rabbitmq'],
-      }
-      Rabbitmq_user_permissions['neutron@/'] -> Service<| tag == 'neutron-service' |>
-
-      # Neutron resources
-      class { '::neutron':
-        default_transport_url => 'rabbit://neutron:an_even_bigger_secret@127.0.0.1:5672/',
-        allow_overlapping_ips => true,
-        core_plugin           => 'ml2',
-        debug                 => true,
-        service_plugins       => ['router', 'metering'],
-      }
-      class { '::neutron::db::mysql':
-        password => 'a_big_secret',
-      }
-      class { '::neutron::keystone::auth':
-        password => 'a_big_secret',
-      }
-      class { '::neutron::plugins::ml2':
-        type_drivers         => ['vxlan'],
-        tenant_network_types => ['vxlan'],
-        mechanism_drivers    => ['openvswitch'],
-      }
-      class { '::neutron::keystone::authtoken':
-        password            => 'a_big_secret',
-      }
-      class { '::neutron::server':
-        database_connection => 'mysql+pymysql://neutron:a_big_secret@127.0.0.1/neutron?charset=utf8',
-        sync_db             => true,
-        service_providers   => [
-          'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver'
-        ],
-      }
-      class { '::neutron::client': }
-      class { '::neutron::quota': }
-      class { '::neutron::agents::dhcp': debug => true }
-      class { '::neutron::agents::l3': debug => true }
-      class { '::neutron::agents::lbaas':
-        debug => true,
-      }
-      class { '::neutron::agents::metering': debug => true }
-      class { '::neutron::agents::ml2::ovs':
-        local_ip         => '127.0.0.1',
-        tunnel_types     => ['vxlan'],
-        # Prior to Newton, the neutron-openvswitch-agent used 'ovs-ofctl' of_interface driver by default.
-        # In Newton, 'of_interface' defaults to 'native'.
-        # This mostly eliminates spawning ovs-ofctl and improves performance a little.
-        # Current openstack-selinux does not allow the Ryu controller to listen on 6633 port.
-        # So in the meantime, let's use old interface:
-        of_interface     => 'ovs-ofctl',
-        ovsdb_interface  => 'vsctl',
-      }
-      class { '::neutron::services::lbaas::haproxy': }
-      class { '::neutron::services::lbaas::octavia': }
-
-      # Create Neutron security group for admin tenant
-      neutron_security_group { 'test':
-        ensure      => present,
-        description => 'Test security group',
-      }
+      include ::openstack_integration::neutron
       EOS