| commit | abae5915f688f49b774c9e882ec4919e1cbcde0b | [log] [tgz] |
|---|---|---|
| author | Zsolt Haraszti <zharaszt@ciena.com> | Sun Oct 16 19:30:34 2016 -0700 |
| committer | Zsolt Haraszti <zharaszt@ciena.com> | Mon Oct 24 01:38:54 2016 -0700 |
| tree | 6cdc393882037225c003bd863089dcd854811f1b | |
| parent | 46c720016aa679c9aec8c80e11b23a5552bc1c9a [diff] [blame] |
Async/streaming gRPC client/server proto This experiment was to fine-tune how we can implement async gRPC client and server code inside a Twisted python app. Change-Id: I945014e27f4b9d6ed624666e0284cc298548adb3 Major cleanup of openflow_13.proto Change-Id: I4e54eaf87b682124ec518a0ade1a6050a6ec6da8 Relocated openflow_13.proto to voltha Change-Id: I66ae45a9142d180c2c6651e75c7a1ee08aef7ef8 Removed forced utest from make build Change-Id: If0da58e9d135ebde6ca68c3316688a03a7b10f2f twisted openflow agent first pass Change-Id: Ibe5b4727ccfe92e6fd464ccd3baf6275569ef5d3 store openflow derived files Change-Id: Ib3e1384bb2ca2a9c0872767f7b793f96b0a154e2 Minor cleanup Change-Id: I1280ed3acb606121b616a0efd573f5f59d010dca Factored out common utils Change-Id: Icd86fcd50f60d0900924674cbcd65e13e47782a1 Refactored twisted agent Change-Id: I71f26ce5357a4f98477df60b8c5ddc068cf75d43 Relocated openflow agent to ofagent ... and preserved obsolete working (non-twisted) agent under ~/obsolete, so we can still run the olt-oftest and pass tests, unit the new twisted based agent reaches that maturity point. Change-Id: I727f8d7144b1291a40276dad2966b7643bd7bc4b olt-oftest in fake mode works with new agent Change-Id: I43b4f5812e8dfaa9f45e4a77fdcf6c30ac520f8d Initial ofagent/voltha operation Change-Id: Ia8104f1285a6b1c51635d36d7d78fc113f800e79 Additional callouts to Voltha Change-Id: If8f483d5140d3c9d45f22b480b8d33249a29cd4e More gRPC calls Change-Id: I7d24fadf9425217fb26ffe18f25359d072ef38fa Flow add/list now works Change-Id: Ie3e3e73108645b47891cef798fc61372a022fd93 Missed some files Change-Id: I29e81238ff1a26c095c0c73e521579edf7092e21
diff --git a/main.py b/main.py index 3892dac..14c854b 100755 --- a/main.py +++ b/main.py
@@ -28,11 +28,11 @@ sys.path.append(base_dir) sys.path.append(os.path.join(base_dir, '/chameleon/protos/third_party')) -from chameleon.structlog_setup import setup_logging -from chameleon.nethelpers import get_my_primary_local_ipv4 -from chameleon.dockerhelpers import get_my_containers_name from chameleon.grpc_client.grpc_client import GrpcClient from chameleon.web_server.web_server import WebServer +from common.utils.dockerhelpers import get_my_containers_name +from common.utils.nethelpers import get_my_primary_local_ipv4 +from common.utils.structlog_setup import setup_logging defs = dict(