Compare commits
3 Commits
0e3e7cbd3a
...
ef1730f4fe
Author | SHA1 | Date | |
---|---|---|---|
ef1730f4fe | |||
146ae8b824 | |||
5a5ad0e654 |
@ -363,8 +363,8 @@ async def leasing_v1_lessor(request: Request):
|
|||||||
|
|
||||||
lease_result_list = []
|
lease_result_list = []
|
||||||
for scope_ref in scope_ref_list:
|
for scope_ref in scope_ref_list:
|
||||||
if scope_ref not in [ALLOTMENT_REF]:
|
# if scope_ref not in [ALLOTMENT_REF]:
|
||||||
raise HTTPException(status_code=500, detail=f'no service instances found for scopes: ["{scope_ref}"]')
|
# raise HTTPException(status_code=500, detail=f'no service instances found for scopes: ["{scope_ref}"]')
|
||||||
|
|
||||||
lease_ref = str(uuid4())
|
lease_ref = str(uuid4())
|
||||||
expires = cur_time + LEASE_EXPIRE_DELTA
|
expires = cur_time + LEASE_EXPIRE_DELTA
|
||||||
@ -381,7 +381,7 @@ async def leasing_v1_lessor(request: Request):
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
data = Lease(origin_ref=origin_ref, scope_ref=scope_ref, lease_ref=lease_ref, lease_created=cur_time, lease_expires=expires)
|
data = Lease(origin_ref=origin_ref, lease_ref=lease_ref, lease_created=cur_time, lease_expires=expires)
|
||||||
Lease.create_or_update(db, data)
|
Lease.create_or_update(db, data)
|
||||||
|
|
||||||
response = {
|
response = {
|
||||||
|
24
app/orm.py
24
app/orm.py
@ -13,6 +13,7 @@ class Origin(Base):
|
|||||||
|
|
||||||
origin_ref = Column(CHAR(length=36), primary_key=True, unique=True, index=True) # uuid4
|
origin_ref = Column(CHAR(length=36), primary_key=True, unique=True, index=True) # uuid4
|
||||||
|
|
||||||
|
# service_instance_xid = Column(CHAR(length=36), nullable=False, index=True) # uuid4 # not necessary, we only support one service_instance_xid ('INSTANCE_REF')
|
||||||
hostname = Column(VARCHAR(length=256), nullable=True)
|
hostname = Column(VARCHAR(length=256), nullable=True)
|
||||||
guest_driver_version = Column(VARCHAR(length=10), nullable=True)
|
guest_driver_version = Column(VARCHAR(length=10), nullable=True)
|
||||||
os_platform = Column(VARCHAR(length=256), nullable=True)
|
os_platform = Column(VARCHAR(length=256), nullable=True)
|
||||||
@ -24,6 +25,7 @@ class Origin(Base):
|
|||||||
def serialize(self) -> dict:
|
def serialize(self) -> dict:
|
||||||
return {
|
return {
|
||||||
'origin_ref': self.origin_ref,
|
'origin_ref': self.origin_ref,
|
||||||
|
# 'service_instance_xid': self.service_instance_xid,
|
||||||
'hostname': self.hostname,
|
'hostname': self.hostname,
|
||||||
'guest_driver_version': self.guest_driver_version,
|
'guest_driver_version': self.guest_driver_version,
|
||||||
'os_platform': self.os_platform,
|
'os_platform': self.os_platform,
|
||||||
@ -72,7 +74,7 @@ class Lease(Base):
|
|||||||
lease_ref = Column(CHAR(length=36), primary_key=True, nullable=False, index=True) # uuid4
|
lease_ref = Column(CHAR(length=36), primary_key=True, nullable=False, index=True) # uuid4
|
||||||
|
|
||||||
origin_ref = Column(CHAR(length=36), ForeignKey(Origin.origin_ref, ondelete='CASCADE'), nullable=False, index=True) # uuid4
|
origin_ref = Column(CHAR(length=36), ForeignKey(Origin.origin_ref, ondelete='CASCADE'), nullable=False, index=True) # uuid4
|
||||||
scope_ref = Column(CHAR(length=36), nullable=False, index=True) # uuid4
|
# scope_ref = Column(CHAR(length=36), nullable=False, index=True) # uuid4 # not necessary, we only support one scope_ref ('ALLOTMENT_REF')
|
||||||
lease_created = Column(DATETIME(), nullable=False)
|
lease_created = Column(DATETIME(), nullable=False)
|
||||||
lease_expires = Column(DATETIME(), nullable=False)
|
lease_expires = Column(DATETIME(), nullable=False)
|
||||||
lease_updated = Column(DATETIME(), nullable=False)
|
lease_updated = Column(DATETIME(), nullable=False)
|
||||||
@ -84,7 +86,7 @@ class Lease(Base):
|
|||||||
return {
|
return {
|
||||||
'lease_ref': self.lease_ref,
|
'lease_ref': self.lease_ref,
|
||||||
'origin_ref': self.origin_ref,
|
'origin_ref': self.origin_ref,
|
||||||
'scope_ref': self.scope_ref,
|
# 'scope_ref': self.scope_ref,
|
||||||
'lease_created': self.lease_created.isoformat(),
|
'lease_created': self.lease_created.isoformat(),
|
||||||
'lease_expires': self.lease_expires.isoformat(),
|
'lease_expires': self.lease_expires.isoformat(),
|
||||||
'lease_updated': self.lease_updated.isoformat(),
|
'lease_updated': self.lease_updated.isoformat(),
|
||||||
@ -180,14 +182,14 @@ def migrate(engine: Engine):
|
|||||||
Lease.__table__.drop(bind=engine)
|
Lease.__table__.drop(bind=engine)
|
||||||
init(engine)
|
init(engine)
|
||||||
|
|
||||||
def upgrade_1_2_to_1_3():
|
# def upgrade_1_2_to_1_3():
|
||||||
x = db.dialect.get_columns(engine.connect(), Lease.__tablename__)
|
# x = db.dialect.get_columns(engine.connect(), Lease.__tablename__)
|
||||||
x = next((_ for _ in x if _['name'] == 'scope_ref'), None)
|
# x = next((_ for _ in x if _['name'] == 'scope_ref'), None)
|
||||||
if x is None:
|
# if x is None:
|
||||||
Lease.scope_ref.compile()
|
# Lease.scope_ref.compile()
|
||||||
column_name = Lease.scope_ref.name
|
# column_name = Lease.scope_ref.name
|
||||||
column_type = Lease.scope_ref.type.compile(engine.dialect)
|
# column_type = Lease.scope_ref.type.compile(engine.dialect)
|
||||||
engine.execute(f'ALTER TABLE "{Lease.__tablename__}" ADD COLUMN "{column_name}" {column_type}')
|
# engine.execute(f'ALTER TABLE "{Lease.__tablename__}" ADD COLUMN "{column_name}" {column_type}')
|
||||||
|
|
||||||
upgrade_1_0_to_1_1()
|
upgrade_1_0_to_1_1()
|
||||||
upgrade_1_2_to_1_3()
|
# upgrade_1_2_to_1_3()
|
||||||
|
@ -33,6 +33,8 @@ nvidia-gridd[2986]: License acquired successfully. (Info: license.nvidia.space,
|
|||||||
|
|
||||||
Most variables and configs are stored in `/var/lib/docker/volumes/configurations/_data`.
|
Most variables and configs are stored in `/var/lib/docker/volumes/configurations/_data`.
|
||||||
|
|
||||||
|
Files can be modified with `docker cp <container-id>:/venv/... /opt/localfile/...` and back.
|
||||||
|
|
||||||
## Dive / Docker image inspector
|
## Dive / Docker image inspector
|
||||||
|
|
||||||
- `dive dls:appliance`
|
- `dive dls:appliance`
|
||||||
|
Loading…
Reference in New Issue
Block a user