Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def validate_region(self, openstack_session, cs_session, cp_resource_model, logg
return True

try:
ks_client = keystone_client.Client(session=openstack_session)
ks_client = keystone_client.Client(session=openstack_session, insecure=True)
ks_client.regions.get(region_name)

except keystoneauth1.exceptions.http.NotFound:
Expand All @@ -168,7 +168,7 @@ def validate_network_attributes(self, openstack_session, cp_resource_model, logg
:param logger:
:return:
"""
net_client = neutron_client.Client(session=openstack_session)
net_client = neutron_client.Client(session=openstack_session, insecure=True)

self.validate_mgmt_network(net_client, cp_resource_model.qs_mgmt_os_net_uuid, logger)

Expand Down Expand Up @@ -208,7 +208,7 @@ def validate_openstack_credentials(self, openstack_session, cs_session, cp_resou
return False

try:
compute_client = nova_client.Client(version='2.0', session=openstack_session)
compute_client = nova_client.Client(version='2.0', session=openstack_session, insecure=True)
# An API Call to Validate Credentials
_ = compute_client.servers.list()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def create_or_get_network_with_segmentation_id(self, openstack_session, cp_resou
:return dict :
"""

client = neutron_client.Client(session=openstack_session)
client = neutron_client.Client(session=openstack_session, insecure=True)

interface_name = cp_resource_model.provider_network_interface
network_type = cp_resource_model.vlan_type.lower()
Expand Down Expand Up @@ -66,7 +66,7 @@ def get_network_with_segmentation_id(self, openstack_session, segmentation_id, l
:return:
"""

client = neutron_client.Client(session=openstack_session)
client = neutron_client.Client(session=openstack_session, insecure=True)

net = client.list_networks(**{'provider:segmentation_id': segmentation_id})
if net['networks']:
Expand All @@ -85,7 +85,7 @@ def create_and_attach_subnet_to_net(self, openstack_session, cp_resource_model,
:return dict:
"""

client = neutron_client.Client(session=openstack_session)
client = neutron_client.Client(session=openstack_session, insecure=True)

cidr = self._get_unused_cidr(client=client, cp_resvd_cidrs=cp_resource_model.reserved_networks, logger=logger)
if cidr is None:
Expand Down Expand Up @@ -116,7 +116,7 @@ def remove_subnet_and_net(self, openstack_session, network, logger):
:return:
"""

client = neutron_client.Client(session=openstack_session)
client = neutron_client.Client(session=openstack_session, insecure=True)

try:
# Get a list of all ports for this network. If there's any port with device owner other than DHCP,
Expand Down Expand Up @@ -242,7 +242,7 @@ def create_floating_ip(self, openstack_session, floating_ip_subnet_id, logger):
:param logger:
:return:
"""
client = neutron_client.Client(session=openstack_session)
client = neutron_client.Client(session=openstack_session, insecure=True)

# make sure subnet already exists
subnet_dict = client.list_subnets(id=floating_ip_subnet_id)
Expand Down Expand Up @@ -272,11 +272,11 @@ def delete_floating_ip(self, openstack_session, floating_ip, logger):
if not floating_ip:
return False

client = neutron_client.Client(session=openstack_session)
client = neutron_client.Client(session=openstack_session, insecure=True)

floating_ips_dict = client.list_floatingips(floating_ip_address=floating_ip)
floating_ip_id = floating_ips_dict['floatingips'][0]['id']

client.delete_floatingip(floating_ip_id)

return True
return True
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def create_instance(self, openstack_session, name, reservation,
if not deploy_req_model.instance_flavor:
raise ValueError("Instance flavor cannot be empty.")

client = novaclient.Client(self.API_VERSION, session=openstack_session)
client = novaclient.Client(self.API_VERSION, session=openstack_session, insecure=True)

logger.info("Creating OpenStack Instance for Image: {0}, Flavor: {1}".format(deploy_req_model.img_uuid,
deploy_req_model.instance_flavor))
Expand Down Expand Up @@ -102,7 +102,7 @@ def terminate_instance(self, openstack_session, instance_id, logger):
if not openstack_session or not instance_id or not logger:
raise ValueError("Any of openstack_session, instance_id can be None")

client = novaclient.Client(self.API_VERSION, session=openstack_session)
client = novaclient.Client(self.API_VERSION, session=openstack_session, insecure=True)
instance = self.get_instance_from_instance_id(openstack_session=openstack_session,
instance_id=instance_id,
logger=logger,
Expand All @@ -121,7 +121,7 @@ def instance_power_on(self, openstack_session, instance_id, logger):
:param LoggingSessionContext logger:
:rtype None:
"""
client = novaclient.Client(self.API_VERSION, session=openstack_session)
client = novaclient.Client(self.API_VERSION, session=openstack_session, insecure=True)
instance = self.get_instance_from_instance_id(openstack_session=openstack_session,
instance_id=instance_id,
logger=logger,
Expand All @@ -146,7 +146,7 @@ def instance_power_off(self, openstack_session, instance_id, logger):
:param LoggingSessionContext logger:
:rtype None:
"""
client = novaclient.Client(self.API_VERSION, session=openstack_session)
client = novaclient.Client(self.API_VERSION, session=openstack_session, insecure=True)
instance = self.get_instance_from_instance_id(openstack_session=openstack_session,
instance_id=instance_id,
logger=logger,
Expand All @@ -171,7 +171,7 @@ def get_instance_mgmt_network_name(self, instance, openstack_session, cp_resourc
:rtype str: Network Name
"""

client = novaclient.Client(self.API_VERSION, session=openstack_session)
client = novaclient.Client(self.API_VERSION, session=openstack_session, insecure=True)

for net in client.networks.list():
net_dict = net.to_dict()
Expand Down Expand Up @@ -211,7 +211,7 @@ def get_instance_from_instance_id(self, openstack_session, instance_id, logger,
:rtype: novaclient.Client.servers.Server
"""
if client is None:
client = novaclient.Client(self.API_VERSION, session=openstack_session)
client = novaclient.Client(self.API_VERSION, session=openstack_session, insecure=True)
try:
instance = client.servers.find(id=instance_id)
return instance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ def _do_get_os_session(self, cs_session, os_res_model, logger):
user_domain_id=user_domain_id,
project_domain_id=proj_domain_id)

return keystone_session.Session(auth=auth)
return keystone_session.Session(auth=auth, verify=False)
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ def test_get_openstack_session(self):
user_domain_id=self.os_res_model.os_domain_name,
project_domain_id=self.os_res_model.os_domain_name)

keystone_session.Session.assert_called_with(auth=mock_auth)
self.assertTrue(result, mock_session)
keystone_session.Session.assert_called_with(auth=mock_auth, verify=False)
self.assertTrue(result, mock_session)