Merge "Delete MidoNet deprecated classes and their tests"

3 files changed, 0 insertions, 216 deletions

diff --git a/spec/classes/tripleo_cluster_cassandra_spec.rb b/spec/classes/tripleo_cluster_cassandra_spec.rb
deleted file mode 100644
index 3f7d471..0000000
--- a/spec/classes/tripleo_cluster_cassandra_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (C) 2015 Midokura SARL
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# Unit tests for the cassandra service
-
-require 'spec_helper'
-
-describe 'tripleo::cluster::cassandra' do
-
-  shared_examples_for 'tripleo::cluster::cassandra' do
-
-    let :params do
-      {
-        :cassandra_servers => ['192.168.2.2', '192.168.2.3'],
-        :cassandra_ip      => '192.168.2.2'
-      }
-    end
-
-    it 'should configure cassandra' do
-      is_expected.to contain_class('cassandra').with(
-        :seeds                      => ['192.168.2.2', '192.168.2.3'],
-        :listen_address             => '192.168.2.2',
-        :storage_port               => 7000,
-        :ssl_storage_port           => 7001,
-        :native_transport_port      => 9042,
-        :rpc_port                   => 9160
-      )
-
-    end
-  end
-
-  on_supported_os.each do |os, facts|
-    context "on #{os}" do
-      let(:facts) do
-        facts.merge({})
-      end
-
-      it_behaves_like 'tripleo::cluster::cassandra'
-    end
-  end
-
-end
diff --git a/spec/classes/tripleo_cluster_zookeeper_spec.rb b/spec/classes/tripleo_cluster_zookeeper_spec.rb
deleted file mode 100644
index fc003b6..0000000
--- a/spec/classes/tripleo_cluster_zookeeper_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Copyright (C) 2015 Midokura SARL
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# Unit tests for the zookeeper service
-
-require 'spec_helper'
-
-describe 'tripleo::cluster::zookeeper' do
-
-  shared_examples_for 'tripleo::cluster::zookeeper' do
-    let :params do
-      {
-        :zookeeper_server_ips => ['23.43.2.34', '23.43.2.35', '24.43.2.36'],
-        :zookeeper_hostnames  => ['host1.midonet', 'host2.midonet', 'host3.midonet']
-      }
-    end
-
-    context 'on host1' do
-      before :each do
-        facts.merge!({ :hostname => 'host1.midonet'})
-        params.merge!({ :zookeeper_client_ip => '23.43.2.34' })
-      end
-
-      it 'should call zookeeper using id==1' do
-        is_expected.to contain_class('zookeeper').with(
-          :servers   => ['23.43.2.34', '23.43.2.35', '24.43.2.36'],
-          :client_ip => '23.43.2.34',
-          :id        => 1
-        )
-      end
-    end
-
-    context 'on host2' do
-      before :each do
-        facts.merge!({ :hostname => 'host2.midonet'})
-        params.merge!({ :zookeeper_client_ip => '23.43.2.35' })
-      end
-
-      it 'should call zookeeper using id==1' do
-        is_expected.to contain_class('zookeeper').with(
-          :servers   => ['23.43.2.34', '23.43.2.35', '24.43.2.36'],
-          :client_ip => '23.43.2.35',
-          :id        => 2
-        )
-      end
-    end
-
-    context 'on host3' do
-      before :each do
-        facts.merge!({ :hostname => 'host3.midonet'})
-        params.merge!({ :zookeeper_client_ip => '23.43.2.36' })
-      end
-
-      it 'should call zookeeper using id==1' do
-        is_expected.to contain_class('zookeeper').with(
-          :servers   => ['23.43.2.34', '23.43.2.35', '24.43.2.36'],
-          :client_ip => '23.43.2.36',
-          :id        => 3
-        )
-      end
-
-    end
-  end
-
-  on_supported_os.each do |os, facts|
-    context "on #{os}" do
-      let(:facts) do
-        facts.merge({})
-      end
-
-      it_behaves_like 'tripleo::cluster::zookeeper'
-    end
-  end
-end
diff --git a/spec/classes/tripleo_midonet_api_spec.rb b/spec/classes/tripleo_midonet_api_spec.rb
deleted file mode 100644
index 25b375b..0000000
--- a/spec/classes/tripleo_midonet_api_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright (C) 2015 Midokura SARL
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# Unit tests for the midonet api
-
-require 'spec_helper'
-
-describe 'tripleo::network::midonet::api' do
-
-  shared_examples_for 'tripleo::midonet::api' do
-
-    let :params do
-      {
-        :zookeeper_servers    => ['192.168.2.1', '192.168.2.2'],
-        :vip                  => '192.23.0.2',
-        :keystone_ip          => '192.23.0.2',
-        :keystone_admin_token => 'admin_token',
-        :admin_password       => 'admin_password',
-        :bind_address         => '192.23.0.65'
-      }
-    end
-
-    it 'should call api configuration' do
-      is_expected.to contain_class('midonet::midonet_api::run').with(
-        :zk_servers                => [{'ip' => '192.168.2.1', 'port' => 2181},
-                                       {'ip' => '192.168.2.2', 'port' => 2181}],
-        :keystone_auth             => true,
-        :tomcat_package            => 'tomcat',
-        :vtep                      => false,
-        :api_ip                    => '192.23.0.2',
-        :api_port                  => '8081',
-        :keystone_host             => '192.23.0.2',
-        :keystone_port             => 35357,
-        :keystone_admin_token      => 'admin_token',
-        :keystone_tenant_name      => 'admin',
-        :catalina_base             => '/usr/share/tomcat',
-        :bind_address              => '192.23.0.65'
-      )
-    end
-
-    it 'should install the cli' do
-      is_expected.to contain_class('midonet::midonet_cli').with(
-        :api_endpoint => 'http://192.23.0.2:8081/midonet-api',
-        :username     => 'admin',
-        :password     => 'admin_password',
-        :tenant_name  => 'admin'
-      )
-    end
-
-  end
-
-  on_supported_os.each do |os, facts|
-    context "on #{os}" do
-      let(:facts) do
-        facts.merge({
-           :augeasversion => '1.0.0'
-        })
-      end
-
-      it_behaves_like 'tripleo::midonet::api'
-    end
-  end
-
-end