Compare commits
No commits in common. "master" and "make-docker-build-succesful" have entirely different histories.
master
...
make-docke
18 changed files with 46 additions and 705 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -44,6 +44,3 @@ secret-key
|
|||
!.gitkeep
|
||||
*.orig
|
||||
.vscode/settings.json
|
||||
2024-*
|
||||
2025-*
|
||||
2023-*
|
||||
|
|
|
|||
|
|
@ -27,6 +27,3 @@ COPY requirements.txt ./
|
|||
RUN LIBRARY_PATH=/lib:/usr/lib /bin/sh -c "pip install --no-cache-dir -r requirements.txt"
|
||||
|
||||
COPY ./ .
|
||||
COPY entrypoint.sh /
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh" ]
|
||||
|
|
|
|||
|
|
@ -15,9 +15,4 @@ tag=${tagprefix}:${version}
|
|||
set -ex
|
||||
|
||||
docker build -t "${tag}" .
|
||||
|
||||
push=$1; shift
|
||||
|
||||
if [ "$push" ]; then
|
||||
docker push "${tag}"
|
||||
fi
|
||||
docker push "${tag}"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
from django.core.management.base import BaseCommand
|
||||
from opennebula_api.models import OpenNebulaManager
|
||||
from datacenterlight.models import VMTemplate
|
||||
from datacenterlight.cms_models import DCLCalculatorPluginModel
|
||||
from membership.models import CustomUser
|
||||
from utils.tasks import send_plain_email_task
|
||||
|
||||
from django.conf import settings
|
||||
from time import sleep
|
||||
import datetime
|
||||
|
|
@ -22,7 +21,6 @@ class Command(BaseCommand):
|
|||
|
||||
def handle(self, *args, **options):
|
||||
result_dict = {}
|
||||
error_dict = {}
|
||||
user_email = options['user_email'] if 'user_email' in options else ""
|
||||
|
||||
if user_email:
|
||||
|
|
@ -33,12 +31,8 @@ class Command(BaseCommand):
|
|||
PROJECT_PATH = os.path.abspath(os.path.dirname(__name__))
|
||||
if not os.path.exists("%s/outputs" % PROJECT_PATH):
|
||||
os.mkdir("%s/outputs" % PROJECT_PATH)
|
||||
public_templates_plugin = DCLCalculatorPluginModel.objects.filter(cmsplugin_ptr_id=23356).first()
|
||||
ipv6_templates_plugin = DCLCalculatorPluginModel.objects.filter(cmsplugin_ptr_id=21943).first()
|
||||
templates = public_templates_plugin.vm_templates_to_show + ipv6_templates_plugin.vm_templates_to_show
|
||||
vm_templates = VMTemplate.objects.filter(opennebula_vm_template_id__in=templates)
|
||||
for vm_template in vm_templates:
|
||||
vm_name = 'test-%s-%s' % (vm_template.vm_type, vm_template.name)
|
||||
for vm_template in VMTemplate.objects.all():
|
||||
vm_name = 'test-%s' % vm_template.name
|
||||
vm_id = manager.create_vm(
|
||||
template_id=vm_template.opennebula_vm_template_id,
|
||||
specs=specs,
|
||||
|
|
@ -58,7 +52,6 @@ class Command(BaseCommand):
|
|||
%s %s''' % (vm_name,
|
||||
vm_template.opennebula_vm_template_id,
|
||||
vm_template.vm_type)
|
||||
error_dict[vm_name] = result_dict[vm_name]
|
||||
self.stdout.write(self.style.ERROR(result_dict[vm_name]))
|
||||
sleep(1)
|
||||
date_str = datetime.datetime.strftime(
|
||||
|
|
@ -69,12 +62,4 @@ class Command(BaseCommand):
|
|||
'w',
|
||||
encoding='utf-8') as f:
|
||||
f.write(json.dumps(result_dict))
|
||||
if error_dict:
|
||||
email_data = {
|
||||
'subject': 'Check VM Templates ERROR',
|
||||
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
|
||||
'to': [settings.ADMIN_EMAIL],
|
||||
'body': json.dumps(error_dict),
|
||||
}
|
||||
send_plain_email_task.delay(email_data)
|
||||
self.stdout.write(self.style.SUCCESS("Done"))
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
from django.core.management.base import BaseCommand
|
||||
from datacenterlight.tasks import handle_metadata_and_emails
|
||||
from datacenterlight.models import StripePlan
|
||||
from opennebula_api.models import OpenNebulaManager
|
||||
from membership.models import CustomUser
|
||||
from hosting.models import GenericProduct
|
||||
import logging
|
||||
import json
|
||||
import sys
|
||||
import stripe
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = '''Stripe plans created before version 3.4 saved the plan name like generic-{subscription_id}-amount. This
|
||||
command aims at replacing this with the actual product name
|
||||
'''
|
||||
|
||||
def handle(self, *args, **options):
|
||||
cnt = 0
|
||||
self.stdout.write(
|
||||
self.style.SUCCESS(
|
||||
'In Fix generic stripe plan product names'
|
||||
)
|
||||
)
|
||||
plans_to_change = StripePlan.objects.filter(stripe_plan_id__startswith='generic')
|
||||
for plan in plans_to_change:
|
||||
response = input("Press 'y' to continue: ")
|
||||
|
||||
# Check if the user entered 'y'
|
||||
if response.lower() == 'y':
|
||||
plan_name = plan.stripe_plan_id
|
||||
first_index_hyphen = plan_name.index("-") + 1
|
||||
product_id = plan_name[
|
||||
first_index_hyphen:(plan_name[first_index_hyphen:].index("-")) + first_index_hyphen]
|
||||
gp = GenericProduct.objects.get(id=product_id)
|
||||
if gp:
|
||||
cnt += 1
|
||||
# update stripe
|
||||
sp = stripe.Plan.retrieve(plan_name)
|
||||
pr = stripe.Product.retrieve(sp.product)
|
||||
pr.name = gp.product_name
|
||||
pr.save()
|
||||
# update local
|
||||
spl = StripePlan.objects.get(stripe_plan_id=plan_name)
|
||||
spl.stripe_plan_name = gp.product_name
|
||||
spl.save()
|
||||
print("%s. %s => %s" % (cnt, plan_name, gp.product_name))
|
||||
else:
|
||||
print("Invalid input. Please try again.")
|
||||
sys.exit()
|
||||
|
||||
print("Done")
|
||||
|
|
@ -73,7 +73,6 @@ def get_line_item_from_hosting_order_charge(hosting_order_id):
|
|||
:return:
|
||||
"""
|
||||
try:
|
||||
print("Hositng order id = %s" % hosting_order_id)
|
||||
hosting_order = HostingOrder.objects.get(id = hosting_order_id)
|
||||
if hosting_order.stripe_charge_id:
|
||||
return mark_safe("""
|
||||
|
|
@ -145,7 +144,7 @@ def get_line_item_from_stripe_invoice(invoice):
|
|||
""".format(
|
||||
vm_id=vm_id if vm_id > 0 else "",
|
||||
ip_addresses=mark_safe(get_ip_addresses(vm_id)) if vm_id > 0 else
|
||||
mark_safe(get_product_name(plan_name)) if plan_name.startswith("generic-") else plan_name,
|
||||
mark_safe(get_product_name(plan_name)),
|
||||
period=mark_safe("%s — %s" % (
|
||||
datetime.datetime.fromtimestamp(start_date).strftime('%Y-%m-%d'),
|
||||
datetime.datetime.fromtimestamp(end_date).strftime('%Y-%m-%d'))),
|
||||
|
|
@ -161,7 +160,8 @@ def get_product_name(plan_name):
|
|||
product_name = ""
|
||||
if plan_name and plan_name.startswith("generic-"):
|
||||
first_index_hyphen = plan_name.index("-") + 1
|
||||
product_id = plan_name[first_index_hyphen:(plan_name[first_index_hyphen:].index("-")) + first_index_hyphen]
|
||||
product_id = plan_name[first_index_hyphen:
|
||||
(plan_name[first_index_hyphen:].index("-")) + first_index_hyphen]
|
||||
try:
|
||||
product = GenericProduct.objects.get(id=product_id)
|
||||
product_name = product.product_name
|
||||
|
|
|
|||
|
|
@ -42,8 +42,6 @@ from .utils import (
|
|||
get_cms_integration, create_vm, clear_all_session_vars, validate_vat_number
|
||||
)
|
||||
|
||||
from datacenterlight.templatetags.custom_tags import get_product_name
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
@ -201,8 +199,6 @@ class IndexView(CreateView):
|
|||
ssd_size=storage,
|
||||
pricing_name=vm_pricing_name
|
||||
)
|
||||
if request.user.id == 51:
|
||||
print("User is test")
|
||||
specs = {
|
||||
'cpu': cores,
|
||||
'memory': memory,
|
||||
|
|
@ -590,9 +586,6 @@ class OrderConfirmationView(DetailView, FormView):
|
|||
context = {}
|
||||
# this is amount to be charge/subscribed before VAT and discount
|
||||
# and expressed in chf. To convert to cents, multiply by 100
|
||||
print("******************************")
|
||||
print("User = {}, ID = {}".format(request.user, request.user.id))
|
||||
print("******************************")
|
||||
amount_to_charge = 0
|
||||
vm_specs = None
|
||||
if (('specs' not in request.session or 'user' not in request.session)
|
||||
|
|
@ -618,7 +611,7 @@ class OrderConfirmationView(DetailView, FormView):
|
|||
# TODO check when we go through this case (to me, it seems useless)
|
||||
card_id = self.request.session.get('card_id')
|
||||
logger.debug("NO id_payment_method, using card: %s" % card_id)
|
||||
card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id)
|
||||
card_detail = UserCardDetail.objects.get(id=card_id)
|
||||
context['cc_last4'] = card_detail.last4
|
||||
context['cc_brand'] = card_detail.brand
|
||||
context['cc_exp_year'] = card_detail.exp_year
|
||||
|
|
@ -652,8 +645,6 @@ class OrderConfirmationView(DetailView, FormView):
|
|||
pricing_name=vm_specs['pricing_name'],
|
||||
vat_rate=user_country_vat_rate * 100
|
||||
)
|
||||
if request.user.id == 51:
|
||||
print("User is test")
|
||||
vm_specs["price"] = price
|
||||
vm_specs["price_after_discount"] = price - discount["amount"]
|
||||
amount_to_charge = price
|
||||
|
|
@ -859,7 +850,7 @@ class OrderConfirmationView(DetailView, FormView):
|
|||
return show_error(msg, self.request)
|
||||
elif 'card_id' in request.session:
|
||||
card_id = request.session.get('card_id')
|
||||
user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id)
|
||||
user_card_detail = UserCardDetail.objects.get(id=card_id)
|
||||
card_details_dict = {
|
||||
'last4': user_card_detail.last4,
|
||||
'brand': user_card_detail.brand,
|
||||
|
|
@ -909,21 +900,15 @@ class OrderConfirmationView(DetailView, FormView):
|
|||
2
|
||||
)
|
||||
)
|
||||
stripe_plan_id = "generic-{0}-{1:.2f}".format(
|
||||
plan_name = "generic-{0}-{1:.2f}".format(
|
||||
request.session['generic_payment_details']['product_id'],
|
||||
amount_to_be_charged
|
||||
)
|
||||
try:
|
||||
product = GenericProduct.objects.get(id=request.session['generic_payment_details']['product_id'])
|
||||
plan_name = product.product_name
|
||||
except Exception as ex:
|
||||
logger.debug("Errori {}" % str(ex))
|
||||
plan_name = get_product_name(stripe_plan_id)
|
||||
stripe_plan_id = plan_name
|
||||
recurring_interval = request.session['generic_payment_details']['recurring_interval']
|
||||
if recurring_interval == "year":
|
||||
stripe_plan_id = "{}-yearly".format(stripe_plan_id)
|
||||
plan_name = "{} (yearly)".format(plan_name)
|
||||
logger.debug("Plan name = {}, Stripe Plan id = {}".format(plan_name, stripe_plan_id))
|
||||
plan_name = "{}-yearly".format(plan_name)
|
||||
stripe_plan_id = plan_name
|
||||
else:
|
||||
template = request.session.get('template')
|
||||
specs = request.session.get('specs')
|
||||
|
|
@ -1016,8 +1001,6 @@ class OrderConfirmationView(DetailView, FormView):
|
|||
# due to some reason. So, we would want to dissociate this card
|
||||
# here.
|
||||
# ...
|
||||
logger.debug("In 1 ***")
|
||||
logger.debug("stripe_subscription_obj == %s" % stripe_subscription_obj)
|
||||
msg = subscription_result.get('error')
|
||||
return show_error(msg, self.request)
|
||||
elif stripe_subscription_obj.status == 'incomplete':
|
||||
|
|
@ -1211,10 +1194,9 @@ def get_or_create_custom_user(request, stripe_api_cus_id):
|
|||
|
||||
def set_user_card(card_id, stripe_api_cus_id, custom_user,
|
||||
card_details_response):
|
||||
logger.debug(":: set_user_card")
|
||||
if card_id:
|
||||
logger.debug("card_id %s was in request" % card_id)
|
||||
user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id)
|
||||
user_card_detail = UserCardDetail.objects.get(id=card_id)
|
||||
card_details_dict = {
|
||||
'last4': user_card_detail.last4,
|
||||
'brand': user_card_detail.brand,
|
||||
|
|
@ -1226,24 +1208,21 @@ def set_user_card(card_id, stripe_api_cus_id, custom_user,
|
|||
stripe_source_id=user_card_detail.card_id
|
||||
)
|
||||
else:
|
||||
logger.debug(" card_id was NOT in request, using "
|
||||
logger.debug("card_id was NOT in request, using "
|
||||
"card_details_response")
|
||||
ucd = UserCardDetail.get_or_create_user_card_detail(
|
||||
stripe_customer=custom_user.stripecustomer,
|
||||
card_details=card_details_response
|
||||
)
|
||||
logger.debug(" ucd = %s" % ucd)
|
||||
UserCardDetail.save_default_card_local(
|
||||
custom_user.stripecustomer.stripe_id,
|
||||
ucd.card_id
|
||||
)
|
||||
logger.debug(" after save_default_card_local")
|
||||
card_details_dict = {
|
||||
'last4': ucd.last4,
|
||||
'brand': ucd.brand,
|
||||
'card_id': ucd.card_id
|
||||
}
|
||||
logger.debug("card_detail_dict = %s" % card_details_dict)
|
||||
return card_details_dict
|
||||
|
||||
|
||||
|
|
@ -1437,30 +1416,6 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response,
|
|||
"""
|
||||
|
||||
logger.debug("do_provisioning")
|
||||
|
||||
try:
|
||||
params = {
|
||||
'request': request,
|
||||
'stripe_api_cus_id': stripe_api_cus_id,
|
||||
'card_details_response': card_details_response,
|
||||
'stripe_subscription_obj': stripe_subscription_obj,
|
||||
'stripe_onetime_charge': stripe_onetime_charge,
|
||||
'gp_details': gp_details,
|
||||
'specs': specs,
|
||||
'vm_template_id': vm_template_id,
|
||||
'template': template,
|
||||
'billing_address_data': billing_address_data,
|
||||
'real_request': real_request
|
||||
}
|
||||
print("Input Parameters:")
|
||||
for key, value in params.items():
|
||||
try:
|
||||
print("{}: {}".format(key, value))
|
||||
except Exception as e:
|
||||
print("{}: [Error printing value: {}]".format(key, str(e)))
|
||||
except Exception as e:
|
||||
print("Error printing parameters: {}".format(str(e)))
|
||||
|
||||
user = request.get('user', None)
|
||||
|
||||
# Create user if the user is not logged in and if he is not already
|
||||
|
|
@ -1472,7 +1427,6 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response,
|
|||
|
||||
card_details_dict = set_user_card(card_id, stripe_api_cus_id, custom_user,
|
||||
card_details_response)
|
||||
logger.debug("after set_user_card %s" % card_details_dict)
|
||||
|
||||
# Save billing address
|
||||
billing_address_data.update({
|
||||
|
|
@ -1495,7 +1449,6 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response,
|
|||
vat_number=billing_address_data['vat_number']
|
||||
)
|
||||
billing_address.save()
|
||||
logger.debug("billing_address saved")
|
||||
|
||||
order = HostingOrder.create(
|
||||
price=request['generic_payment_details']['amount'],
|
||||
|
|
@ -1503,7 +1456,6 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response,
|
|||
billing_address=billing_address,
|
||||
vm_pricing=VMPricing.get_default_pricing()
|
||||
)
|
||||
logger.debug("hosting order created")
|
||||
|
||||
# Create a Hosting Bill
|
||||
HostingBill.create(customer=stripe_cus,
|
||||
|
|
@ -1560,9 +1512,7 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response,
|
|||
["%s=%s" % (k, v) for (k, v) in context.items()]),
|
||||
'reply_to': [context['email']],
|
||||
}
|
||||
logger.debug("Sending email")
|
||||
send_plain_email_task.delay(email_data)
|
||||
logger.debug("After Sending email")
|
||||
recurring_text = _(" This is a monthly recurring plan.")
|
||||
if gp_details['recurring_interval'] == "year":
|
||||
recurring_text = _(" This is an yearly recurring plan.")
|
||||
|
|
@ -1586,7 +1536,6 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response,
|
|||
),
|
||||
'reply_to': ['info@ungleich.ch'],
|
||||
}
|
||||
logger.debug("Before Sending customer email")
|
||||
send_plain_email_task.delay(email_data)
|
||||
redirect_url = reverse('datacenterlight:index')
|
||||
logger.debug("Sent user/admin emails")
|
||||
|
|
@ -1630,7 +1579,7 @@ def do_provisioning(request, stripe_api_cus_id, card_details_response,
|
|||
|
||||
|
||||
def get_error_response_dict(msg, request):
|
||||
logger.debug("Init get_error_response_dict {}".format(msg))
|
||||
logger.error(msg)
|
||||
response = {
|
||||
'status': False,
|
||||
'redirect': "{url}#{section}".format(
|
||||
|
|
|
|||
|
|
@ -777,9 +777,3 @@ if DEBUG:
|
|||
from .local import * # flake8: noqa
|
||||
else:
|
||||
from .prod import * # flake8: noqa
|
||||
|
||||
# Try to load dynamic configuration, if it exists
|
||||
try:
|
||||
from .dynamic import * # flake8: noqa
|
||||
except ImportError:
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -uex
|
||||
|
||||
cd /usr/src/app/
|
||||
cat > dynamicweb/settings/dynamic.py <<EOF
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||
'NAME': '${POSTGRES_DB}',
|
||||
'USER': '${POSTGRES_USER}',
|
||||
'PASSWORD': '${POSTGRES_PASSWORD}',
|
||||
'HOST': '${POSTGRES_HOST}',
|
||||
'PORT': '5432',
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
exec "$@"
|
||||
|
|
@ -1,143 +0,0 @@
|
|||
from django.core.management.base import BaseCommand
|
||||
import datetime
|
||||
import csv
|
||||
import logging
|
||||
import stripe
|
||||
from hosting.models import VATRates, StripeTaxRate
|
||||
from utils.hosting_utils import get_vat_rate_for_country
|
||||
from django.conf import settings
|
||||
from membership.models import CustomUser, StripeCustomer
|
||||
|
||||
stripe.api_key = settings.STRIPE_API_PRIVATE_KEY
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = '''FI vat rate changes on 2024-09-01 from 24% to 25.5%. This commands makes the necessary changes'''
|
||||
|
||||
def handle(self, *args, **options):
|
||||
MAKE_MODIFS=False
|
||||
try:
|
||||
country_to_change = 'FI'
|
||||
currency_to_change = 'EUR'
|
||||
new_rate = 25.5
|
||||
user_country_vat_rate = get_vat_rate_for_country(country_to_change)
|
||||
logger.debug("Existing VATRate for %s %s " % (country_to_change, user_country_vat_rate))
|
||||
vat_rate = VATRates.objects.get(
|
||||
territory_codes=country_to_change, start_date__isnull=False, stop_date=None
|
||||
)
|
||||
logger.debug("VAT rate for %s is %s" % (country_to_change, vat_rate.rate))
|
||||
logger.debug("vat_rate object = %s" % vat_rate)
|
||||
logger.debug("Create end date for the VATRate %s" % vat_rate.id)
|
||||
#if MAKE_MODIFS:
|
||||
# vat_rate.stop_date = datetime.date(2024, 8, 31)
|
||||
# vat_rate.save()
|
||||
# print("Creating a new VATRate for FI")
|
||||
# obj, created = VATRates.objects.get_or_create(
|
||||
# start_date=datetime.date(2024, 9, 1),
|
||||
# stop_date=None,
|
||||
# territory_codes=country_to_change,
|
||||
# currency_code=currency_to_change,
|
||||
# rate=new_rate * 0.01,
|
||||
# rate_type="standard",
|
||||
# description="FINLAND standard VAT (added manually on %s)" % datetime.datetime.now()
|
||||
# )
|
||||
# if created:
|
||||
# logger.debug("Created new VAT Rate for %s with the new rate %s" % (country_to_change, new_rate))
|
||||
# logger.debug(obj)
|
||||
# else:
|
||||
# logger.debug("VAT Rate for %s already exists with the rate %s" % (country_to_change, new_rate))
|
||||
logger.debug("Getting all subscriptions of %s that need a VAT Rate change")
|
||||
subscriptions = stripe.Subscription.list(limit=100) # Increase the limit to 100 per page (maximum)
|
||||
fi_subs = []
|
||||
|
||||
while subscriptions:
|
||||
for subscription in subscriptions:
|
||||
if len(subscription.default_tax_rates) > 0 and subscription.default_tax_rates[0].jurisdiction and subscription.default_tax_rates[0].jurisdiction.lower() == 'fi':
|
||||
fi_subs.append(subscription)
|
||||
elif len(subscription.default_tax_rates) > 0:
|
||||
print("subscription %s belongs to %s" % (subscription.id, subscription.default_tax_rates[0].jurisdiction))
|
||||
else:
|
||||
print("subscription %s does not have a tax rate" % subscription.id)
|
||||
if subscriptions.has_more:
|
||||
print("FETCHING MORE")
|
||||
subscriptions = stripe.Subscription.list(limit=100, starting_after=subscriptions.data[-1])
|
||||
else:
|
||||
break
|
||||
logger.debug("There are %s FI subscription that need VAT rate update" % len(fi_subs))
|
||||
|
||||
# CSV column headers
|
||||
csv_headers = [
|
||||
"customer_name",
|
||||
"customer_email",
|
||||
"stripe_customer_id",
|
||||
"subscription_id",
|
||||
"subscription_name",
|
||||
"amount",
|
||||
"vat_rate"
|
||||
]
|
||||
# CSV file name
|
||||
csv_filename = "fi_subscriptions_change_2024.csv"
|
||||
# Write subscription data to CSV file
|
||||
with open(csv_filename, mode='w', newline='') as csv_file:
|
||||
writer = csv.DictWriter(csv_file, fieldnames=csv_headers)
|
||||
writer.writeheader()
|
||||
|
||||
for subscription in fi_subs:
|
||||
subscription_id = subscription["id"]
|
||||
stripe_customer_id = subscription.get("customer", "")
|
||||
vat_rate = subscription.get("tax_percent", "")
|
||||
c_user = CustomUser.objects.get(
|
||||
id=StripeCustomer.objects.filter(stripe_id=stripe_customer_id)[0].user.id)
|
||||
if c_user:
|
||||
customer_name = c_user.name.encode('utf-8')
|
||||
customer_email = c_user.email
|
||||
items = subscription.get("items", {}).get("data", [])
|
||||
for item in items:
|
||||
subscription_name = item.get("plan", {}).get("id", "")
|
||||
amount = item.get("plan", {}).get("amount", "")
|
||||
|
||||
# Convert amount to a proper format (e.g., cents to dollars)
|
||||
amount_in_chf = amount / 100 # Adjust this conversion as needed
|
||||
|
||||
# Writing to CSV
|
||||
writer.writerow({
|
||||
"customer_name": customer_name,
|
||||
"customer_email": customer_email,
|
||||
"stripe_customer_id": stripe_customer_id,
|
||||
"subscription_id": subscription_id,
|
||||
"subscription_name": subscription_name,
|
||||
"amount": amount_in_chf,
|
||||
"vat_rate": vat_rate # Fill in VAT rate if available
|
||||
})
|
||||
else:
|
||||
print("No customuser for %s %s" % (stripe_customer_id, subscription_id))
|
||||
|
||||
|
||||
if MAKE_MODIFS:
|
||||
print("Making modifications now")
|
||||
tax_rate_obj = stripe.TaxRate.create(
|
||||
display_name="VAT",
|
||||
description="VAT for %s" % country_to_change,
|
||||
jurisdiction=country_to_change,
|
||||
percentage=new_rate,
|
||||
inclusive=False,
|
||||
)
|
||||
stripe_tax_rate = StripeTaxRate.objects.create(
|
||||
display_name=tax_rate_obj.display_name,
|
||||
description=tax_rate_obj.description,
|
||||
jurisdiction=tax_rate_obj.jurisdiction,
|
||||
percentage=tax_rate_obj.percentage,
|
||||
inclusive=False,
|
||||
tax_rate_id=tax_rate_obj.id
|
||||
)
|
||||
|
||||
for fi_sub in fi_subs:
|
||||
fi_sub.default_tax_rates = [stripe_tax_rate.tax_rate_id]
|
||||
fi_sub.save()
|
||||
logger.debug("Default tax rate updated for %s" % fi_sub.id)
|
||||
else:
|
||||
print("Not making any modifications because MAKE_MODIFS=False")
|
||||
|
||||
except Exception as e:
|
||||
print(" *** Error occurred. Details {}".format(str(e)))
|
||||
|
|
@ -1,10 +1,7 @@
|
|||
from django.contrib import messages
|
||||
from django.shortcuts import redirect
|
||||
from django.conf import settings
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from opennebula_api.exceptions import TemplateNotFoundError
|
||||
from opennebula_api.serializers import VirtualMachineTemplateSerializer
|
||||
from opennebula_api.models import OpenNebulaManager
|
||||
|
||||
|
|
@ -17,15 +14,7 @@ class ProcessVMSelectionMixin(object):
|
|||
|
||||
template_id = int(request.POST.get('vm_template_id'))
|
||||
configuration_id = int(request.POST.get('configuration'))
|
||||
try:
|
||||
template = OpenNebulaManager().get_template(template_id)
|
||||
except TemplateNotFoundError:
|
||||
messages.error(
|
||||
request,
|
||||
_('The selected configuration is no longer available. '
|
||||
'Please choose another one.')
|
||||
)
|
||||
return redirect(reverse('hosting:index'))
|
||||
template = OpenNebulaManager().get_template(template_id)
|
||||
data = VirtualMachineTemplateSerializer(template).data
|
||||
configuration = HostingPlan.objects.get(id=configuration_id)
|
||||
|
||||
|
|
|
|||
|
|
@ -699,116 +699,15 @@ class UserCardDetail(AssignPermissionsMixin, models.Model):
|
|||
|
||||
@staticmethod
|
||||
def save_default_card_local(stripe_api_cus_id, card_id):
|
||||
print("save_default_card_local {}, {}".format(stripe_api_cus_id, card_id))
|
||||
stripe_cust = StripeCustomer.objects.get(stripe_id=stripe_api_cus_id)
|
||||
print(" stripe_cust={}".format(stripe_cust))
|
||||
user_card_detail = UserCardDetail.get_ucd_from_stripe_cust_n_card_id(
|
||||
stripe_cust, card_id
|
||||
user_card_detail = UserCardDetail.objects.get(
|
||||
stripe_customer=stripe_cust, card_id=card_id
|
||||
)
|
||||
print(" user_card_detail={}".format(user_card_detail.__dict__))
|
||||
for card in stripe_cust.usercarddetail_set.all():
|
||||
card.preferred = False
|
||||
card.save()
|
||||
user_card_detail.preferred = True
|
||||
user_card_detail.save()
|
||||
print(" save_default_card_local DONE")
|
||||
|
||||
@staticmethod
|
||||
def get_ucd_from_card_id(card_id):
|
||||
try:
|
||||
user_card_details = UserCardDetail.objects.filter(
|
||||
card_id=card_id
|
||||
).order_by('-id')
|
||||
|
||||
if user_card_details.count() > 1:
|
||||
# Log a warning about the duplicate entries
|
||||
logger.warning(
|
||||
"Multiple UserCardDetail objects found for card_id={}. "
|
||||
"Found {} objects. Using the latest one.".format(
|
||||
card_id, user_card_details.count()
|
||||
)
|
||||
)
|
||||
# Use the first object found
|
||||
user_card_detail = user_card_details.first()
|
||||
elif user_card_details.count() == 1:
|
||||
# Exactly one object found, proceed as intended
|
||||
user_card_detail = user_card_details.first()
|
||||
else:
|
||||
# No object found for the given customer and card_id.
|
||||
# Depending on expected behavior, you might want to raise an error or handle this case.
|
||||
# If the original get() call happened here, it would raise DoesNotExist.
|
||||
logger.error(
|
||||
"No UserCardDetail found for card_id={}.".format(card_id)
|
||||
)
|
||||
raise UserCardDetail.DoesNotExist("No UserCardDetail found for card {}".format(card_id))
|
||||
if user_card_details.count() > 1:
|
||||
# Log a warning about the duplicate entries
|
||||
logger.warning(
|
||||
"Multiple UserCardDetail objects found for card_id={}. "
|
||||
"Found {} objects. Using the first one.".format(
|
||||
card_id, user_card_details.count()
|
||||
)
|
||||
)
|
||||
# Use the first object found
|
||||
user_card_detail = user_card_details.first()
|
||||
elif user_card_details.count() == 1:
|
||||
# Exactly one object found, proceed as intended
|
||||
user_card_detail = user_card_details.first()
|
||||
else:
|
||||
# No object found for the given customer and card_id.
|
||||
# Depending on expected behavior, you might want to raise an error or handle this case.
|
||||
# If the original get() call happened here, it would raise DoesNotExist.
|
||||
logger.error(
|
||||
"No UserCardDetail found for card_id={}.".format(card_id)
|
||||
)
|
||||
raise UserCardDetail.DoesNotExist("No UserCardDetail found for card {}".format(card_id))
|
||||
except Exception as e:
|
||||
# Catch other potential exceptions during the filter/get process if necessary
|
||||
logger.error("An unexpected error occurred while fetching UserCardDetail: {}".format(e))
|
||||
raise
|
||||
return user_card_detail
|
||||
|
||||
@staticmethod
|
||||
def get_ucd_from_stripe_cust_n_card_id(stripe_cust, card_id):
|
||||
try:
|
||||
user_card_details = UserCardDetail.objects.filter(
|
||||
stripe_customer=stripe_cust, card_id=card_id
|
||||
).order_by('-id')
|
||||
|
||||
if user_card_details.count() > 1:
|
||||
# Log a warning about the duplicate entries
|
||||
logger.warning(
|
||||
"Multiple UserCardDetail objects found for stripe_customer_id={} and card_id={}. "
|
||||
"Found {} objects. Using the first one.".format(
|
||||
stripe_cust.id, card_id, user_card_details.count()
|
||||
)
|
||||
)
|
||||
# Use the first object found
|
||||
user_card_detail = user_card_details.first()
|
||||
elif user_card_details.count() == 1:
|
||||
# Exactly one object found, proceed as intended
|
||||
user_card_detail = user_card_details.first()
|
||||
else:
|
||||
# No object found for the given customer and card_id.
|
||||
# Depending on expected behavior, you might want to raise an error or handle this case.
|
||||
# If the original get() call happened here, it would raise DoesNotExist.
|
||||
logger.error(
|
||||
"No UserCardDetail found for stripe_customer_id={} and card_id={}.".format(
|
||||
stripe_cust.id, card_id
|
||||
)
|
||||
)
|
||||
raise UserCardDetail.DoesNotExist(
|
||||
"No UserCardDetail found for customer {}, card {}".format(
|
||||
stripe_cust.id, card_id
|
||||
)
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
# Catch other potential exceptions during the filter/get process if necessary
|
||||
logger.error("An unexpected error occurred while fetching UserCardDetail: {}".format(e))
|
||||
raise
|
||||
return user_card_detail
|
||||
|
||||
|
||||
@staticmethod
|
||||
def get_user_card_details(stripe_customer, card_details):
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
<tbody>
|
||||
{% for ho, stripe_charge_data in invs_charge %}
|
||||
<tr>
|
||||
{{ ho.id | get_line_item_from_hosting_order_charge }}
|
||||
{{ ho | get_line_item_from_hosting_order_charge }}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -810,7 +810,7 @@ class PaymentVMView(LoginRequiredMixin, FormView):
|
|||
card_id = form.cleaned_data.get('card')
|
||||
customer = owner.stripecustomer
|
||||
try:
|
||||
user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id)
|
||||
user_card_detail = UserCardDetail.objects.get(id=card_id)
|
||||
if not request.user.has_perm(
|
||||
'view_usercarddetail', user_card_detail
|
||||
):
|
||||
|
|
@ -1014,7 +1014,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
|
|||
context['cc_exp_month'] = card_details_response['exp_month']
|
||||
else:
|
||||
card_id = self.request.session.get('card_id')
|
||||
card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id)
|
||||
card_detail = UserCardDetail.objects.get(id=card_id)
|
||||
context['cc_last4'] = card_detail.last4
|
||||
context['cc_brand'] = card_detail.brand
|
||||
context['cc_exp_year'] = card_detail.exp_year
|
||||
|
|
@ -1128,7 +1128,7 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
|
|||
return JsonResponse(response)
|
||||
else:
|
||||
card_id = request.session.get('card_id')
|
||||
user_card_detail = UserCardDetail.get_ucd_from_card_id(card_id=card_id)
|
||||
user_card_detail = UserCardDetail.objects.get(id=card_id)
|
||||
card_details_dict = {
|
||||
'last4': user_card_detail.last4,
|
||||
'brand': user_card_detail.brand,
|
||||
|
|
@ -1339,7 +1339,7 @@ class InvoiceListView(LoginRequiredMixin, TemplateView):
|
|||
).order_by('-created_at')
|
||||
stripe_chgs = []
|
||||
for ho in hosting_orders:
|
||||
stripe_chgs.append({ho: stripe.Charge.retrieve(ho.stripe_charge_id)})
|
||||
stripe_chgs.append({ho.id: stripe.Charge.retrieve(ho.stripe_charge_id)})
|
||||
|
||||
paginator_charges = Paginator(stripe_chgs, 10)
|
||||
try:
|
||||
|
|
@ -1557,11 +1557,6 @@ class VirtualMachinesPlanListView(LoginRequiredMixin, ListView):
|
|||
serializer = VirtualMachineSerializer(queryset, many=True)
|
||||
return serializer.data
|
||||
except ConnectionRefusedError:
|
||||
logger.exception(
|
||||
"Could not load VMs of user %s (%s) from OpenNebula" % (
|
||||
owner.username, owner.email
|
||||
)
|
||||
)
|
||||
messages.error(self.request,
|
||||
'We could not load your VMs due to a backend connection \
|
||||
error. Please try again in a few minutes'
|
||||
|
|
|
|||
|
|
@ -8,13 +8,3 @@ class UserExistsError(Exception):
|
|||
|
||||
class UserCredentialError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class TemplateNotFoundError(Exception):
|
||||
"""Raised when an OpenNebula VM template id does not exist (any more)."""
|
||||
|
||||
def __init__(self, template_id):
|
||||
super(TemplateNotFoundError, self).__init__(
|
||||
"OpenNebula template %s does not exist" % template_id
|
||||
)
|
||||
self.template_id = template_id
|
||||
|
|
|
|||
|
|
@ -9,10 +9,7 @@ from oca.pool import WrongNameError, WrongIdError
|
|||
from hosting.models import HostingOrder
|
||||
from utils.models import CustomUser
|
||||
from utils.tasks import save_ssh_key, save_ssh_key_error_handler
|
||||
from .exceptions import (
|
||||
KeyExistsError, UserExistsError, UserCredentialError,
|
||||
TemplateNotFoundError
|
||||
)
|
||||
from .exceptions import KeyExistsError, UserExistsError, UserCredentialError
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -428,60 +425,16 @@ class OpenNebulaManager():
|
|||
except:
|
||||
return []
|
||||
|
||||
@staticmethod
|
||||
def resolve_template_id(template_id):
|
||||
"""
|
||||
Map a (possibly retired) template id to its replacement, as
|
||||
configured in settings.UPDATED_TEMPLATES_DICT. Ids without a
|
||||
mapping are returned unchanged.
|
||||
"""
|
||||
template_id = int(template_id)
|
||||
return settings.UPDATED_TEMPLATES_DICT.get(template_id, template_id)
|
||||
|
||||
def get_template_names(self):
|
||||
"""
|
||||
Return a dict {template_id: template_name} of every template
|
||||
visible to oneadmin, in a single RPC call.
|
||||
|
||||
:raises ConnectionRefusedError: if OpenNebula is unreachable
|
||||
"""
|
||||
try:
|
||||
template_pool = self._get_template_pool()
|
||||
return dict(
|
||||
(template.id, template.name) for template in template_pool
|
||||
)
|
||||
except ConnectionRefusedError:
|
||||
raise
|
||||
except Exception:
|
||||
# Any other failure (socket timeout, XML-RPC fault, ...) is a
|
||||
# backend problem as far as the callers are concerned
|
||||
logger.exception("Could not fetch the OpenNebula template pool")
|
||||
raise ConnectionRefusedError
|
||||
|
||||
def get_template(self, template_id):
|
||||
"""
|
||||
Return the oca template object for the given id.
|
||||
|
||||
:raises TemplateNotFoundError: if the template (after applying
|
||||
settings.UPDATED_TEMPLATES_DICT) does not exist in OpenNebula
|
||||
:raises ConnectionRefusedError: if OpenNebula is unreachable or
|
||||
fails in any other way
|
||||
"""
|
||||
template_id = self.resolve_template_id(template_id)
|
||||
template_id = int(template_id)
|
||||
try:
|
||||
template_pool = self._get_template_pool()
|
||||
if template_id in settings.UPDATED_TEMPLATES_DICT.keys():
|
||||
template_id = settings.UPDATED_TEMPLATES_DICT[template_id]
|
||||
return template_pool.get_by_id(template_id)
|
||||
except WrongIdError:
|
||||
logger.error(
|
||||
"OpenNebula template %s does not exist" % template_id
|
||||
)
|
||||
raise TemplateNotFoundError(template_id)
|
||||
except ConnectionRefusedError:
|
||||
raise
|
||||
except Exception:
|
||||
logger.exception(
|
||||
"Could not fetch OpenNebula template %s" % template_id
|
||||
)
|
||||
except Exception as ex:
|
||||
logger.debug("Template Id we are looking for : %s" % template_id)
|
||||
logger.error(str(ex))
|
||||
raise ConnectionRefusedError
|
||||
|
||||
def create_template(self, name, cores, memory, disk_size, core_price,
|
||||
|
|
|
|||
|
|
@ -1,44 +1,12 @@
|
|||
import ipaddress
|
||||
import logging
|
||||
|
||||
from builtins import hasattr
|
||||
from rest_framework import serializers
|
||||
|
||||
from oca import OpenNebulaException
|
||||
|
||||
from .exceptions import TemplateNotFoundError
|
||||
from .models import OpenNebulaManager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
TEMPLATE_NAME_PREFIXES = ('public-', 'ipv6only-')
|
||||
|
||||
|
||||
def strip_template_prefix(name):
|
||||
"""
|
||||
Remove the DCL naming prefix ('public-', 'ipv6only-') from a template
|
||||
or VM name. str.lstrip() must not be used here: it strips a character
|
||||
set, so 'public-ubuntu'.lstrip('public-') gives 'ntu'.
|
||||
"""
|
||||
for prefix in TEMPLATE_NAME_PREFIXES:
|
||||
if name.startswith(prefix):
|
||||
return name[len(prefix):]
|
||||
return name
|
||||
|
||||
|
||||
def template_name_from_vm_name(vm_name, vm_id):
|
||||
"""
|
||||
VMs created by dynamicweb are named '<template name>-<vm id>' (see
|
||||
OpenNebulaManager.create_vm), so the template name can be recovered
|
||||
from the VM name when the template itself has been deleted. VMs that
|
||||
were created or renamed outside dynamicweb do not follow that pattern
|
||||
and are returned unchanged.
|
||||
"""
|
||||
suffix = '-%s' % vm_id
|
||||
if vm_name.endswith(suffix):
|
||||
return vm_name[:-len(suffix)]
|
||||
return vm_name
|
||||
|
||||
|
||||
class VirtualMachineTemplateSerializer(serializers.Serializer):
|
||||
"""Serializer to map the virtual machine template instance into JSON format."""
|
||||
|
|
@ -68,7 +36,10 @@ class VirtualMachineTemplateSerializer(serializers.Serializer):
|
|||
return int(obj.template.memory) / 1024
|
||||
|
||||
def get_name(self, obj):
|
||||
return strip_template_prefix(obj.name)
|
||||
if obj.name.startswith('public-'):
|
||||
return obj.name.lstrip('public-')
|
||||
else:
|
||||
return obj.name
|
||||
|
||||
|
||||
class VirtualMachineSerializer(serializers.Serializer):
|
||||
|
|
@ -162,45 +133,13 @@ class VirtualMachineSerializer(serializers.Serializer):
|
|||
price += int(disk.size) / 1024 * 0.6
|
||||
return price
|
||||
|
||||
def _template_name(self, template_id):
|
||||
"""
|
||||
Resolve a template id to its name using one template pool fetch per
|
||||
serializer instance. With many=True the child serializer is shared
|
||||
across all VMs, so a whole VM list costs a single RPC call instead
|
||||
of one OpenNebulaManager (and template pool fetch) per VM.
|
||||
|
||||
:raises TemplateNotFoundError: if the template no longer exists
|
||||
:raises ConnectionRefusedError: if OpenNebula is unreachable
|
||||
"""
|
||||
if not hasattr(self, '_template_names'):
|
||||
self._template_names = OpenNebulaManager().get_template_names()
|
||||
template_id = OpenNebulaManager.resolve_template_id(template_id)
|
||||
if template_id not in self._template_names:
|
||||
raise TemplateNotFoundError(template_id)
|
||||
return self._template_names[template_id]
|
||||
|
||||
def get_configuration(self, obj):
|
||||
"""
|
||||
The name of the template the VM was created from, without the DCL
|
||||
prefix. A VM whose template has since been deleted from OpenNebula
|
||||
must not break serialization of the whole VM list, so fall back to
|
||||
the template name embedded in the VM name.
|
||||
"""
|
||||
template_id = obj.template.template_id
|
||||
try:
|
||||
name = self._template_name(template_id)
|
||||
except TemplateNotFoundError as err:
|
||||
logger.warning(
|
||||
"VM %s: %s, falling back to VM name" % (obj.id, err)
|
||||
)
|
||||
name = template_name_from_vm_name(obj.name, obj.id)
|
||||
except ConnectionRefusedError:
|
||||
logger.error(
|
||||
"VM %s: could not fetch template pool, falling back to "
|
||||
"VM name" % obj.id
|
||||
)
|
||||
name = template_name_from_vm_name(obj.name, obj.id)
|
||||
return strip_template_prefix(name)
|
||||
template = OpenNebulaManager().get_template(template_id)
|
||||
if template.name.startswith('public-'):
|
||||
return template.name.lstrip('public-')
|
||||
else:
|
||||
return template.name
|
||||
|
||||
def get_ipv4(self, obj):
|
||||
"""
|
||||
|
|
@ -229,7 +168,10 @@ class VirtualMachineSerializer(serializers.Serializer):
|
|||
return '-'
|
||||
|
||||
def get_name(self, obj):
|
||||
return strip_template_prefix(obj.name)
|
||||
if obj.name.startswith('public-'):
|
||||
return obj.name.lstrip('public-')
|
||||
else:
|
||||
return obj.name
|
||||
|
||||
|
||||
class VMTemplateSerializer(serializers.Serializer):
|
||||
|
|
|
|||
|
|
@ -2,18 +2,11 @@ import random
|
|||
import string
|
||||
|
||||
from django.conf import settings
|
||||
from django.test import TestCase, override_settings
|
||||
from django.test import TestCase
|
||||
from unittest import skipIf
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
from oca.pool import WrongIdError
|
||||
|
||||
from .exceptions import TemplateNotFoundError
|
||||
from .models import OpenNebulaManager
|
||||
from .serializers import (
|
||||
VirtualMachineSerializer, strip_template_prefix,
|
||||
template_name_from_vm_name
|
||||
)
|
||||
from .serializers import VirtualMachineSerializer
|
||||
from utils.models import CustomUser
|
||||
|
||||
|
||||
|
|
@ -156,124 +149,3 @@ class VirtualMachineSerializerTestCase(TestCase):
|
|||
serialized.data.get('name'), vm.name.lstrip('public-')
|
||||
)
|
||||
break
|
||||
|
||||
|
||||
class TemplateNameHelpersTestCase(TestCase):
|
||||
def test_strip_template_prefix(self):
|
||||
self.assertEqual(strip_template_prefix('public-Ubuntu 20.10'),
|
||||
'Ubuntu 20.10')
|
||||
self.assertEqual(strip_template_prefix('ipv6only-Alpine 3.21'),
|
||||
'Alpine 3.21')
|
||||
self.assertEqual(strip_template_prefix('Devuan Beowulf'),
|
||||
'Devuan Beowulf')
|
||||
|
||||
def test_strip_template_prefix_is_not_lstrip(self):
|
||||
# str.lstrip('public-') strips a character set and would give 'ntu'
|
||||
self.assertEqual(strip_template_prefix('public-ubuntu'), 'ubuntu')
|
||||
|
||||
def test_template_name_from_vm_name(self):
|
||||
self.assertEqual(
|
||||
template_name_from_vm_name('public-Ubuntu 20.10-26623', 26623),
|
||||
'public-Ubuntu 20.10'
|
||||
)
|
||||
|
||||
def test_template_name_from_vm_name_keeps_custom_names(self):
|
||||
# VMs created or renamed outside dynamicweb
|
||||
self.assertEqual(template_name_from_vm_name('gitea', 27001), 'gitea')
|
||||
self.assertEqual(
|
||||
template_name_from_vm_name('ipv6only-Alpine 3.15-27397-Jonas',
|
||||
27397),
|
||||
'ipv6only-Alpine 3.15-27397-Jonas'
|
||||
)
|
||||
|
||||
|
||||
def _fake_vm(vm_id, name, template_id):
|
||||
vm = MagicMock()
|
||||
vm.id = vm_id
|
||||
vm.name = name
|
||||
vm.template.template_id = template_id
|
||||
return vm
|
||||
|
||||
|
||||
class VirtualMachineSerializerMissingTemplateTestCase(TestCase):
|
||||
"""
|
||||
A VM whose OpenNebula template has been deleted must not break the
|
||||
serialization of the whole VM list (the symptom was the generic
|
||||
"backend connection error" banner on /hosting/my-virtual-machines).
|
||||
"""
|
||||
|
||||
def _configuration(self, vms, template_names):
|
||||
serializer = VirtualMachineSerializer(vms, many=True)
|
||||
with patch.object(OpenNebulaManager, '__init__', return_value=None), \
|
||||
patch.object(OpenNebulaManager, 'get_template_names',
|
||||
return_value=template_names) as get_names:
|
||||
configurations = [
|
||||
serializer.child.get_configuration(vm) for vm in vms
|
||||
]
|
||||
return configurations, get_names
|
||||
|
||||
@override_settings(UPDATED_TEMPLATES_DICT={})
|
||||
def test_missing_template_falls_back_to_vm_name(self):
|
||||
vms = [
|
||||
_fake_vm(28344, 'public-Alpine 3.21-28344', 310),
|
||||
_fake_vm(26623, 'public-Ubuntu 20.10-26623', 164),
|
||||
]
|
||||
configurations, _ = self._configuration(
|
||||
vms, {310: 'public-Alpine 3.21'}
|
||||
)
|
||||
self.assertEqual(configurations, ['Alpine 3.21', 'Ubuntu 20.10'])
|
||||
|
||||
@override_settings(UPDATED_TEMPLATES_DICT={164: 192})
|
||||
def test_updated_templates_mapping_is_applied(self):
|
||||
vms = [_fake_vm(26623, 'public-Ubuntu 20.10-26623', 164)]
|
||||
configurations, _ = self._configuration(
|
||||
vms, {192: 'public-Ubuntu 20.10 (new)'}
|
||||
)
|
||||
self.assertEqual(configurations, ['Ubuntu 20.10 (new)'])
|
||||
|
||||
@override_settings(UPDATED_TEMPLATES_DICT={})
|
||||
def test_template_pool_is_fetched_once_per_list(self):
|
||||
vms = [
|
||||
_fake_vm(1, 'public-Alpine 3.21-1', 310),
|
||||
_fake_vm(2, 'public-Alpine 3.21-2', 310),
|
||||
_fake_vm(3, 'public-Ubuntu 20.10-3', 164),
|
||||
]
|
||||
_, get_names = self._configuration(vms, {310: 'public-Alpine 3.21'})
|
||||
self.assertEqual(get_names.call_count, 1)
|
||||
|
||||
@override_settings(UPDATED_TEMPLATES_DICT={})
|
||||
def test_unreachable_template_pool_falls_back_to_vm_name(self):
|
||||
vms = [_fake_vm(26623, 'public-Ubuntu 20.10-26623', 164)]
|
||||
serializer = VirtualMachineSerializer(vms, many=True)
|
||||
with patch.object(OpenNebulaManager, '__init__', return_value=None), \
|
||||
patch.object(OpenNebulaManager, 'get_template_names',
|
||||
side_effect=ConnectionRefusedError):
|
||||
configuration = serializer.child.get_configuration(vms[0])
|
||||
self.assertEqual(configuration, 'Ubuntu 20.10')
|
||||
|
||||
|
||||
class OpenNebulaManagerGetTemplateTestCase(TestCase):
|
||||
@override_settings(UPDATED_TEMPLATES_DICT={164: 192})
|
||||
def test_resolve_template_id(self):
|
||||
self.assertEqual(OpenNebulaManager.resolve_template_id(164), 192)
|
||||
self.assertEqual(OpenNebulaManager.resolve_template_id('164'), 192)
|
||||
self.assertEqual(OpenNebulaManager.resolve_template_id(310), 310)
|
||||
|
||||
@override_settings(UPDATED_TEMPLATES_DICT={})
|
||||
def test_missing_template_raises_template_not_found(self):
|
||||
pool = MagicMock()
|
||||
pool.get_by_id.side_effect = WrongIdError
|
||||
with patch.object(OpenNebulaManager, '__init__', return_value=None), \
|
||||
patch.object(OpenNebulaManager, '_get_template_pool',
|
||||
return_value=pool):
|
||||
with self.assertRaises(TemplateNotFoundError) as ctx:
|
||||
OpenNebulaManager().get_template(164)
|
||||
self.assertEqual(ctx.exception.template_id, 164)
|
||||
|
||||
@override_settings(UPDATED_TEMPLATES_DICT={})
|
||||
def test_unreachable_pool_still_raises_connection_error(self):
|
||||
with patch.object(OpenNebulaManager, '__init__', return_value=None), \
|
||||
patch.object(OpenNebulaManager, '_get_template_pool',
|
||||
side_effect=ConnectionRefusedError):
|
||||
with self.assertRaises(ConnectionRefusedError):
|
||||
OpenNebulaManager().get_template(164)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue