Skip to content

Commit

Permalink
fix: handling for missing --add-schedule or --mod-schedule
Browse files Browse the repository at this point in the history 
additional fix for badfish on get_reset_types
additional fix for --host listing 2 clouds when date arg
is passed.
fix for extend/shrink on non current/future allocations

closes: #356
closes: #355
Change-Id: Ida59b01f742b0f57d1c64ff636c2dcf7726c6e13
  • Loading branch information
@grafuls
grafuls committed Jan 18, 2021
1 parent 45533e6 commit 4815886
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 79 deletions.
153 changes: 101 additions & 52 deletions bin/quads-cli
View file
Expand Up @@ -482,6 +482,10 @@ def main(_args):
)
exit(1)

weeks = 0
_date = None
end_date = None

if _args.weeks:
try:
weeks = int(_args.weeks)
Expand All @@ -499,37 +503,40 @@ def main(_args):

schedules = Schedule.current_schedule(cloud=cloud)
if not schedules:
logger.error(
logger.warning(
"The selected cloud does not have any active schedules"
)
exit(1)
future_schedule = Schedule.future_schedules(cloud=cloud)
if future_schedule:
confirmation = input(
f"Would you like to extend a future allocation of {cloud.name}? (y/N): "
) or "N"

hosts = Host.objects(cloud=cloud)
non_extendable = []
if confirmation.lower() not in ("y", "yes"):
exit(0)

if not hosts:
logger.error(
"The selected cloud does not have any active hosts assigned"
)
exit(1)
schedules = future_schedule
else:
exit(1)

for host in hosts:
schedule = Schedule.current_schedule(host=host).first()
if _args.weeks:
non_extendable = []
for schedule in schedules:
if weeks:
end_date = schedule.end + timedelta(weeks=weeks)
else:
end_date = _date
if (
not Schedule.is_host_available(
host=host.name, start=schedule.end, end=end_date
host=schedule.host.name, start=schedule.end, end=end_date
)
or end_date < schedule.end
):
non_extendable.append(host)
non_extendable.append(schedule.host)

if non_extendable:
logger.info(
"The following hosts cannot be extended for the current allocation or target date is sooner than current end date:"
"The following hosts cannot be extended for the "
"allocation or target date is sooner than current end date:"
)
for host in non_extendable:
logger.info(host.name)
Expand All @@ -548,21 +555,21 @@ def main(_args):
)

for schedule in schedules:
if _args.weeks:
if weeks:
end_date = schedule.end + timedelta(weeks=weeks)
else:
end_date = _date
schedule.update(end=end_date)

if _args.weeks:
if weeks:
logger.info(
"Cloud %s has now been extended for %s week[s] until %s"
% (cloud.name, str(weeks), str(end_date)[:16])
)
else:
logger.info(
"Cloud %s has now been extended until %s"
% (cloud.name, str(end_date)[:16])
% (cloud.name, str(_date)[:16])
)
else:
logger.info(
Expand All @@ -579,18 +586,30 @@ def main(_args):
schedule = Schedule.current_schedule(host=host).first()
if not schedule:
logger.error("The selected host does not have any active schedules")
exit(1)
future_schedule = Schedule.future_schedules(host=host).first()
if future_schedule:
confirmation = input(
f"Would you like to extend a future allocation of {host.name}? (y/N): "
) or "N"

if confirmation.lower() not in ("y", "yes"):
exit(0)

schedule = future_schedule
else:
exit(1)

if _args.weeks:
end_date = schedule.end + timedelta(weeks=weeks)
else:
end_date = _date
if not Schedule.is_host_available(
host=host.name, start=schedule.end, end=end_date
):
) or end_date < schedule.end:
logger.info(
"The host cannot be extended for the current allocation as "
"it is not available during that time frame"
"it is not available during that time frame or end date would "
"result in a shrink action."
)
exit(1)

Expand All @@ -606,10 +625,6 @@ def main(_args):
seven_days=False,
)

if _args.weeks:
end_date = schedule.end + timedelta(weeks=int(weeks))
else:
end_date = _date
schedule.update(end=end_date)
if _args.weeks:
logger.info(
Expand Down Expand Up @@ -644,6 +659,10 @@ def main(_args):
exit(1)

time_delta = timedelta()
weeks = 0
_date = None
end_date = None

if _args.weeks:
try:
weeks = int(_args.weeks)
Expand All @@ -659,7 +678,7 @@ def main(_args):
threshold = datetime.now() + timedelta(hours=1)

if _args.cloud:
cloud = Cloud.objects(name=str(_args.extendcloud)).first()
cloud = Cloud.objects(name=str(_args.cloud)).first()
if not cloud:
logger.error("Cloud not found")
exit(1)
Expand All @@ -669,25 +688,28 @@ def main(_args):
logger.error(
"The selected cloud does not have any active schedules"
)
exit(1)
future_schedules = Schedule.future_schedules(cloud=cloud)
if future_schedules:
confirmation = input(
f"Would you like to shrink a future allocation of {cloud.name}? (y/N): "
) or "N"

hosts = Host.objects(cloud=cloud)
non_shrinkable = []
if confirmation.lower() not in ("y", "yes"):
exit(0)

if not hosts:
logger.error(
"The selected cloud does not have any active hosts assigned"
)
exit(1)
schedules = future_schedules
else:
exit(1)

for host in hosts:
schedule = Schedule.current_schedule(host=host).first()
non_shrinkable = []

for schedule in schedules:
if _args.weeks:
end_date = schedule.end - time_delta
else:
end_date = _date
if end_date < schedule.start or end_date > schedule.end or (not _args.now and end_date < threshold):
non_shrinkable.append(host)
non_shrinkable.append(schedule.host)

if non_shrinkable:
logger.info(
Expand All @@ -710,10 +732,14 @@ def main(_args):
seven_days=True,
)

if _args.weeks:
confirmation = input(f"Are you sure you want to shrink {cloud.name} for {_args.weeks} week[s]? (y/N): ") or "N"
if weeks:
confirmation = input(
f"Are you sure you want to shrink {cloud.name} for {_args.weeks} week[s]? (y/N): "
) or "N"
else:
confirmation = input(f"Are you sure you want to shrink {cloud.name} to {str(_date)[:16]}? (y/N): ") or "N"
confirmation = input(
f"Are you sure you want to shrink {cloud.name} to {str(_date)[:16]}? (y/N): "
) or "N"

if confirmation.lower() not in ("y", "yes"):
exit(0)
Expand All @@ -724,7 +750,7 @@ def main(_args):
else:
end_date = _date
schedule.update(end=end_date)
if _args.weeks:
if weeks:
logger.info(
"Cloud %s has now been shrunk for %s week[s] until %s"
% (cloud.name, str(weeks), str(end_date)[:16])
Expand All @@ -737,7 +763,7 @@ def main(_args):
else:
logger.info("Cloud %s has now been terminated" % cloud.name)
else:
if _args.weeks:
if weeks:
logger.info(
"Cloud %s can be shrunk for %s week[s] to %s"
% (cloud.name, str(weeks), str(end_date)[:16])
Expand All @@ -759,9 +785,20 @@ def main(_args):
schedule = Schedule.current_schedule(host=host).first()
if not schedule:
logger.error("The selected host does not have any active schedules")
exit(1)
future_schedule = Schedule.future_schedules(host=host).first()
if future_schedule:
confirmation = input(
f"Would you like to shrink a future allocation of {host.name}? (y/N): "
) or "N"

if _args.weeks:
if confirmation.lower() not in ("y", "yes"):
exit(0)

schedule = future_schedule
else:
exit(1)

if weeks:
end_date = schedule.end - time_delta
else:
end_date = _date
Expand All @@ -784,13 +821,15 @@ def main(_args):
seven_days=True,
)

confirmation = input(f"Are you sure you want to shrink {host.name} to {str(end_date)[:16]}? (y/N): ") or "N"
confirmation = input(
f"Are you sure you want to shrink {host.name} to {str(end_date)[:16]}? (y/N): "
) or "N"

if confirmation.lower() not in ("y", "yes"):
exit(0)

schedule.update(end=end_date)
if _args.weeks:
if weeks:
logger.info(
"Host %s has now been shrunk for %s week[s] to %s"
% (host.name, str(weeks), str(end_date)[:16])
Expand All @@ -805,7 +844,7 @@ def main(_args):
"Host %s schedule has now been terminated" % host.name
)
else:
if _args.weeks:
if weeks:
logger.info(
"Host %s can be shrunk for %s weeks until %s"
% (host.name, str(weeks), str(end_date)[:16])
Expand Down Expand Up @@ -1050,8 +1089,8 @@ def main(_args):
# Host Remove
elif _args.rmhost is not None:
_host = Host.objects(name=_args.rmhost).first()
future_schedules = Schedule.future_schedules(host=_host)
if future_schedules:
future_schedule = Schedule.future_schedules(host=_host)
if future_schedule:
logger.error("Can't remove host with future schedule.")
exit(1)
url = os.path.join(API_URL, "host", _args.rmhost)
Expand Down Expand Up @@ -1442,17 +1481,27 @@ def main(_args):
exit(1)

elif _args.host:
if _args.schedstart or _args.schedend:
logger.error(
"Missing arguments: `--schedule-start` and/or `--schedule-end` "
"can be used with `--add-schedule` or `--mod-schedule`"
)
exit(1)
_host = Host.objects(name=_args.host).first()
if _host:
_kwargs = {"host": _host}
if _args.datearg:
_kwargs["date"] = datetime.strptime(
datetime_obj = datetime.strptime(
_args.datearg, "%Y-%m-%d %H:%M"
).isoformat()
)
_kwargs["date"] = datetime_obj.isoformat()
else:
datetime_obj = datetime.now()
schedules = Schedule.current_schedule(**_kwargs)
if schedules:
for schedule in schedules:
logger.info(schedule.cloud.name)
if schedule.end != datetime_obj:
logger.info(schedule.cloud.name)
else:
logger.info(_host.default_cloud.name)
else:
Expand Down
2 changes: 1 addition & 1 deletion quads/tools/badfish.py
View file
Expand Up @@ -298,7 +298,7 @@ async def get_reset_types(self):
else:
manager_reset = data["Actions"].get("#Manager.Reset")
if manager_reset:
reset_types = manager_reset.get("ResetType@Redfish.AllowableValues")
reset_types = manager_reset.get("ResetType@Redfish.AllowableValues", [])
if not reset_types:
logger.warning("Could not get allowable reset types")
return reset_types
Expand Down
27 changes: 18 additions & 9 deletions quads/tools/regenerate_vlans_wiki.py
View file
@@ -1,22 +1,26 @@
#!/usr/bin/python3
import logging

from xmlrpc.client import ProtocolError
from quads.tools.racks_wiki import update_wiki
from quads.config import conf as quads_config
from quads.model import Vlan, Cloud, Schedule
from tempfile import NamedTemporaryFile


HEADERS = [
'VLANID',
'IPRange',
'NetMask',
'Gateway',
'IPFree',
'Owner',
'Ticket',
'Cloud',
"VLANID",
"IPRange",
"NetMask",
"Gateway",
"IPFree",
"Owner",
"Ticket",
"Cloud",
]

logger = logging.getLogger(__name__)


def render_header(markdown):
header = "| %s |\n" % " | ".join(HEADERS)
Expand Down Expand Up @@ -73,7 +77,12 @@ def regenerate_vlans_wiki():
render_header(_markdown)
render_vlans(_markdown)
_markdown.seek(0)
update_wiki(wp_url, wp_username, wp_password, page_title, page_id, _markdown.name)
try:
update_wiki(
wp_url, wp_username, wp_password, page_title, page_id, _markdown.name
)
except ProtocolError as ex:
logger.error(ex.errmsg)


if __name__ == "__main__":
Expand Down

0 comments on commit 4815886

Please sign in to comment.