Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spot market #1

Merged
merged 62 commits into from
Jun 17, 2022
Merged
Show file tree
Hide file tree
Changes from 49 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
e57df6c
start the market project
juagargi Apr 8, 2022
cf34ba2
development instructions
juagargi Apr 8, 2022
7f9fb74
new django project market
juagargi Apr 8, 2022
b7d4edb
new django app market
juagargi Apr 8, 2022
3bff604
add makefile, grpc rule and script
juagargi Apr 8, 2022
2f1989d
update protobuf
juagargi Apr 8, 2022
8d81ac3
ignore DB and pycache
juagargi Apr 8, 2022
0ccc6c2
add Offer
juagargi Apr 8, 2022
910deeb
generate requirements.txt with hashes for all
juagargi Apr 8, 2022
a76e33f
basic grpc setup
juagargi Apr 11, 2022
45b502f
fix grpc generation
juagargi Apr 11, 2022
7b897b2
manual testing
juagargi Apr 11, 2022
4f0ff13
test framework and first test
juagargi Apr 11, 2022
2b81f92
WIP adding tests to Offer
juagargi Apr 11, 2022
e8234e1
Offer model.
juagargi Apr 22, 2022
9b0c9d3
Fix Offer.contains()
juagargi Apr 22, 2022
43fca76
Relocate test files
juagargi Apr 22, 2022
51d52d1
Finish list RPC.
juagargi Apr 22, 2022
9dd6c94
AddOffer RPC.
juagargi Apr 22, 2022
bc54eba
offer has an ID
juagargi Apr 22, 2022
d212f35
purchase profile
juagargi May 6, 2022
2e9a30b
refactor
juagargi May 6, 2022
72b96ce
wip purchase
juagargi May 6, 2022
9351ef8
moved models.py to models/offer.py
juagargi May 6, 2022
9fe19eb
Contract and PurchaseOrder
juagargi May 7, 2022
0487fe3
purchase returns contract id instead
juagargi May 7, 2022
0d37428
added integration test
juagargi May 7, 2022
111c367
get contract RPC WIP
juagargi May 13, 2022
e0bcbc8
add cryptography pip package
juagargi May 13, 2022
a2e9b1c
split the purchase service
juagargi May 13, 2022
f31d1d5
make explicit the ban to delete Offer
juagargi May 13, 2022
481df09
rename file in models
juagargi May 13, 2022
718c86a
print ok when integration test succeeds
juagargi May 13, 2022
93c59da
cleanup
juagargi May 13, 2022
f7e1a02
IA parsing and validator
juagargi May 13, 2022
345f436
added AS model
juagargi May 13, 2022
4cd14b6
broker and as models;create-client and broker management cmds
juagargi May 20, 2022
16d76ab
add pyyaml to requirements
juagargi May 21, 2022
1be3839
create fixtures
juagargi May 21, 2022
1ea4eff
offer.iaid is a string now
juagargi May 21, 2022
4c5ad86
iaid in Offer is a string now.
juagargi May 21, 2022
1c4a463
check seller's signature in offer, store with broker's signature
juagargi May 21, 2022
b6a0b0f
purchase order has a buyer FK
juagargi May 21, 2022
12375ea
signatures are always base64 encoded strings
juagargi May 21, 2022
73159ec
verify signature of buyers
juagargi May 21, 2022
9ca4978
contracts signed by the broker
juagargi May 21, 2022
f287aea
add UT for offer.pre_save
juagargi May 21, 2022
e0fc4e0
move serializers out of django
juagargi May 21, 2022
06ddfa1
fix bug with transaction;finish integration test.
juagargi May 22, 2022
a6c1c91
add test target to makefile
juagargi Jun 1, 2022
ef2db9d
add rule to makefile to run integraiton tests
juagargi Jun 1, 2022
128e31f
don't echo make commands; rules are phony
juagargi Jun 1, 2022
e2dfee3
removed unused imports
juagargi Jun 1, 2022
42ae4b0
bw unit is now 1 Mbps
juagargi Jun 1, 2022
4095eb8
Kill all children process even when python bails.
juagargi Jun 3, 2022
feb0bcd
new proto message: offer specification.
juagargi Jun 3, 2022
bd2057f
Change RPC AddOffer to accept the specification.
juagargi Jun 3, 2022
d2a26ef
rename nanounit to picounit.
juagargi Jun 3, 2022
8bf7c8d
All signatures are bytes.
juagargi Jun 3, 2022
466a4e7
when make test failes, it repeats the test in single thread to read t…
juagargi Jun 3, 2022
f9b7e90
UT failures are shown when run in parallel.
juagargi Jun 17, 2022
4f368b4
Price per standard unit.
juagargi Jun 17, 2022
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
4 changes: 4 additions & 0 deletions market/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
__pycache__/

# DB related
db.sqlite3
5 changes: 5 additions & 0 deletions market/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.PHONY: protobuf

protobuf:
./tools/make_protobuf.sh

24 changes: 24 additions & 0 deletions market/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Spot Market

The spot market is a virtual market where sellers can post their bandwidth offers
on the whiteboard, and buyers can buy part or the total amount of the offer.

An offer contains a bandwidth profile (bandwidth vs time) and a path policy (what ASes can
be reached using this offer).

## Development

### Install pip packages:
```bash
python3 -m venv .venv
echo '*' > .venv/.gitignore
source .venv/bin/activate
pip install --require-hashes -r requirements.txt
```

### Add new dependencies:
The project uses pip-tools. Edit the `requirements.in` file and generate a new `requirements.txt`
for pip to use:
```bash
pip-compile --generate-hashes --allow-unsafe --output-file=requirements.txt requirements.in
```
3 changes: 3 additions & 0 deletions market/defs.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# define constants
BW_UNIT = 1000000000 # 1 Gbps
juagargi marked this conversation as resolved.
Show resolved Hide resolved
BW_PERIOD = 600 # 600 seconds = 10 minutes
153 changes: 153 additions & 0 deletions market/integration_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
#!/usr/bin/env python

# This test runs Django gRPC, a provider, and two clients.
# The provider adds an offer and the clients list and attempt to buy it.
# The profile that the clients buy is exactly half of the offer, so the
# aggregation of the purchases should fit. Because the first client to
# buy the offer will destroy the original offer (as its bandwidth is now halved),
# the second client will need to list and buy again.

# The test ends terminating Django gRPC.
# The test exits with 0 if okay, non zero otherwise.


from django.utils import timezone as tz
from google.protobuf.timestamp_pb2 import Timestamp
from concurrent.futures import ThreadPoolExecutor
from pathlib import Path
from defs import BW_PERIOD
from util.conversion import pb_timestamp_from_time
from util import crypto
from util import serialize

import sys
import os
import subprocess
import time
import grpc
import market_pb2
import market_pb2_grpc


def _list(channel):
stub = market_pb2_grpc.MarketControllerStub(channel)
response = stub.ListOffers(market_pb2.ListRequest())
offers = [o for o in response]
return offers


def _buy(channel, key, buyer_ia, offer):
stub = market_pb2_grpc.MarketControllerStub(channel)
request = market_pb2.PurchaseRequest(
offer_id=offer.id,
buyer_iaid=buyer_ia,
signature=b"",
bw_profile="1,1,1,1",
starting_on=pb_timestamp_from_time(tz.datetime.fromisoformat("2022-04-01T20:00:00.000000+00:00")))
# sign the purchase request
offerbytes = serialize.offer_fields_serialize_to_bytes(
offer.iaid,
offer.iscore,
offer.notbefore.ToSeconds(),
offer.notafter.ToSeconds(),
offer.reachable_paths,
offer.qos_class,
offer.price_per_nanounit,
offer.bw_profile
)
data = serialize.purchase_order_fields_serialize_to_bytes(
offerbytes,
request.bw_profile,
request.starting_on.ToSeconds()
)
request.signature = crypto.signature_create(key, data)
return stub.Purchase(request)


def run_django():
if os.path.exists("db.sqlite3"):
os.remove("db.sqlite3")
p = subprocess.Popen(["./manage.py", "migrate"], stdout=subprocess.DEVNULL)
p.wait()
p = subprocess.Popen(
["./manage.py", "loaddata", "./market/fixtures/testdata.yaml"],
stdout=subprocess.DEVNULL)
p.wait()
p = subprocess.Popen(["./manage.py", "grpcrunserver"])
time.sleep(1)
return p


def provider():
with grpc.insecure_channel('localhost:50051') as channel:
stub = market_pb2_grpc.MarketControllerStub(channel)
notbefore = tz.datetime.fromisoformat("2022-04-01T20:00:00.000000+00:00")
notafter = notbefore + tz.timedelta(seconds=4*BW_PERIOD)
o = market_pb2.Offer(
iaid="1-ff00:0:110",
iscore=True,
signature=b"",
notbefore=Timestamp(seconds=int(notbefore.timestamp())),
notafter=Timestamp(seconds=int(notafter.timestamp())),
reachable_paths="*",
qos_class=1,
price_per_nanounit=10,
bw_profile="2,2,2,2")
with open(Path(__file__).parent.joinpath("market", "tests", "data",
"1-ff00_0_110.key"), "r") as f:
key = crypto.load_key(f.read())
# sign with private key
data = serialize.offer_serialize_to_bytes(o)
o.signature = crypto.signature_create(key, data)
# do RPC
saved = stub.AddOffer(o)
print(f"provider created offer with id {saved.id}")


def client(ia: str, wait: int):
# load key
iafile = ia.replace(":", "_")
with open(Path(__file__).parent.joinpath("market", "tests", "data", iafile + ".key"), "r") as f:
key = crypto.load_key(f.read())
# buy
for _ in range(2):
with grpc.insecure_channel('localhost:50051') as channel:
offers = _list(channel)
time.sleep(wait)
o = offers[0]
response = _buy(channel, key, ia, o)
if response.contract_id > 0:
print(f"Client with ID: {ia} got contract with ID: {response.contract_id}")
return 0
print(f"Client with ID: {ia} could not buy: {response.message}")
print(f"Client with ID: {ia} too many attempts")
return 1


def main():
# run django like this, or change to what is said on
# https://stackoverflow.com/questions/19447603/how-to-kill-a-python-child-process-created-with-\
# subprocess-check-output-when-t/19448096#19448096
django = run_django()
provider()
with ThreadPoolExecutor() as executor:
tasks = [
executor.submit(lambda: client("1-ff00:0:111", 1)),
executor.submit(lambda: client("1-ff00:0:112", 0)),
]
res = 0
for t in tasks:
if t.result() != 0:
res = 1
django.terminate()
try:
django.wait(timeout=1)
finally:
pass
django.kill()
print(f"done (exits with {res})")
return res


if __name__ == "__main__":
sys.exit(main())
22 changes: 22 additions & 0 deletions market/manage.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env python
"""Django's command-line utility for administrative tasks."""
import os
import sys


def main():
"""Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'market.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
"available on your PYTHONPATH environment variable? Did you "
"forget to activate a virtual environment?"
) from exc
execute_from_command_line(sys.argv)


if __name__ == '__main__':
main()
Empty file added market/market/__init__.py
Empty file.
3 changes: 3 additions & 0 deletions market/market/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.contrib import admin

# Register your models here.
6 changes: 6 additions & 0 deletions market/market/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class MarketConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'market'
16 changes: 16 additions & 0 deletions market/market/asgi.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"""
ASGI config for market project.

It exposes the ASGI callable as a module-level variable named ``application``.

For more information on this file, see
https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/
"""

import os

from django.core.asgi import get_asgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'market.settings')

application = get_asgi_application()
39 changes: 39 additions & 0 deletions market/market/fixtures/create_fixtures.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
from market.models.ases import AS
from market.models.broker import Broker
from util import crypto
from pathlib import Path


def _ases():
ases = ["1-ff00:0:110", "1-ff00:0:111", "1-ff00:0:112"]
for iaid in ases:
# load certificate
cert = iaid.replace(":", "_") + ".crt"
p = Path(__file__).parent.parent.joinpath("tests", "data", cert)
with open(p, "r") as f:
cert = crypto.load_certificate(f.read())
# create AS
AS.objects.create(
iaid=iaid,
cert=cert,
)


def _broker():
# load key
with open(Path(__file__).parent.parent.joinpath("tests", "data", "broker.key"), "r") as f:
key = crypto.load_key(f.read())
# load certificate
with open(Path(__file__).parent.parent.joinpath("tests", "data", "broker.crt"), "r") as f:
cert = crypto.load_certificate(f.read())
# create broker
Broker.objects.create(
certificate_pem=crypto.certificate_to_pem(cert),
key_pem=crypto.key_to_pem(key)
)


def create_fixtures():
_ases()
_broker()
pass
Loading