From ca4a1d815cd70f148a6c88236093da0feaf0b449 Mon Sep 17 00:00:00 2001 From: gabrik Date: Tue, 19 May 2020 10:51:38 +0200 Subject: [PATCH 1/4] preparing 0.2 Signed-off-by: gabrik --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules index 01bb183e..1aabc01f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,3 +37,7 @@ [submodule "plugins/plugin-fdu-containerd"] path = plugins/plugin-fdu-containerd url = https://github.com/eclipse-fog05/plugin-fdu-containerd + +[submodule "plugins/plugin-fdu-ros2"] + path = plugins/plugin-fdu-ros2 + url = https://github.com/eclipse-fog05/plugin-fdu-ros2 From 8abffa5785158cc4a5db82fe92358b3beeb899bc Mon Sep 17 00:00:00 2001 From: gabrik Date: Fri, 5 Jun 2020 12:01:49 +0200 Subject: [PATCH 2/4] updated rest proxy with latest api Signed-off-by: gabrik --- src/utils/python/rest_proxy/src/service.json | 2 +- src/utils/python/rest_proxy/src/service.py | 405 ++++++++++--------- 2 files changed, 223 insertions(+), 184 deletions(-) diff --git a/src/utils/python/rest_proxy/src/service.json b/src/utils/python/rest_proxy/src/service.json index 43be11fa..9aee5283 100644 --- a/src/utils/python/rest_proxy/src/service.json +++ b/src/utils/python/rest_proxy/src/service.json @@ -1,6 +1,6 @@ { "host": "0.0.0.0", - "port": 8080, + "port": 5000, "debug": true, "yaks": "127.0.0.1", "sysid": "0", diff --git a/src/utils/python/rest_proxy/src/service.py b/src/utils/python/rest_proxy/src/service.py index b0948b9f..af6cea16 100755 --- a/src/utils/python/rest_proxy/src/service.py +++ b/src/utils/python/rest_proxy/src/service.py @@ -4,6 +4,9 @@ import os from flask import Flask, request, abort, send_from_directory, url_for from fog05 import FIMAPI +from fog05_sdk.interfaces import Constants +from fog05_sdk.interfaces.FDU import FDU +from fog05_sdk.interfaces.InfraFDU import InfraFDU # conf = None @@ -14,51 +17,73 @@ @app.route('/') def index(): - return json.dumps({'name':'Eclipse fog05 REST Proxy', 'version':'0.0.1', 'system':conf.get('sysid'), 'tenant':conf.get('tenantid')}) + return json.dumps({'name':'Eclipse fog05 REST Proxy', 'version':'0.2.0', 'system':conf.get('sysid'), 'tenant':conf.get('tenantid')}) # NODE -@app.route('/node/list', methods=['GET']) +@app.route('/nodes/list', methods=['GET']) def node_list(): return json.dumps(fos_api.node.list()) -@app.route('/node/info/', methods=['GET']) +@app.route('/nodes//info', methods=['GET']) def node_info(uuid): return json.dumps(fos_api.node.info(uuid)) -@app.route('/node/status/', methods=['GET']) +@app.route('/node//status', methods=['GET']) def node_status(uuid): return json.dumps(fos_api.node.status(uuid)) -@app.route('/node/plugins/', methods=['GET']) +@app.route('/nodes//plugins/list', methods=['GET']) def node_plugins(uuid): return json.dumps(fos_api.node.plugins(uuid)) # PLUGIN -@app.route('/plugin/info//', methods=['GET']) +@app.route('/nodes//plugins//info', methods=['GET']) def plugin_info(pl_uuid, node_uuid): return json.dumps(fos_api.plugin.info(node_uuid, pl_uuid)) # NETWORK -@app.route('/network/add', methods=['POST']) -def network_add(): - data = request.data - if isinstance(data,bytes): - data = data.decode() - descriptor = json.loads(data) - return json.dumps({'result':fos_api.network.add_network(descriptor)}) - - -@app.route('/network/remove/', methods=['DELETE']) -def network_remove(net_id): - return json.dumps({'result':fos_api.network.remove_network(net_id)}) +@app.route('/networks//info', methods=['GET','PUT','DELETE']) +def network(net_uuid): + + method = request.method + if method == 'GET': + nets = fos_api.network.list() + n = [n for n in nets if n.get('uuid') == net_uuid] + if len(n) == 0: + return json.dumps({}) + return json.dumps(n[0]) + elif method == 'PUT': + descriptor = json.loads(request.data) + return json.dumps(fos_api.network.add_network(descriptor)) + elif method == 'DELETE': + return json.dumps(fos_api.network.remove_network(net_uuid)) + + + +@app.route('/nodes//network//info', methods=['PUT', 'DELETE']) +def network_node(node, net_id): + method = request.method + if method == 'PUT': + descriptor = json.loads(request.data) + try: + res = json.dumps(fos_api.network.add_network_to_node(descriptor, node)) + except ValueError as ve: + return json.dumps({'error':'{}'.format(ve)}) + return res + elif method == 'DELETE': + try: + res = json.dumps(fos_api.network.remove_network_from_node(net_id, node)) + except ValueError as ve: + return json.dumps({'error':'{}'.format(ve)}) + return res @app.route('/network/list', methods=['GET']) @@ -66,144 +91,170 @@ def network_list(): return json.dumps(fos_api.network.list()) -@app.route('/connection_point/add', methods=['POST']) -def cp_add(): - data = request.data - if isinstance(data,bytes): - data = data.decode() - descriptor = json.loads(data) - return json.dumps({'result':fos_api.network.add_connection_point(descriptor)}) +# @app.route('/connection_point/add', methods=['POST']) +# def cp_add(): +# data = request.data +# if isinstance(data,bytes): +# data = data.decode() +# descriptor = json.loads(data) +# return json.dumps({'result':fos_api.network.add_connection_point(descriptor)}) -@app.route('/connection_point/remove/', methods=['DELETE']) -def cp_remove(cp_id): - return json.dumps({'result':fos_api.network.delete_connection_point(cp_id)}) +# @app.route('/connection_point/remove/', methods=['DELETE']) +# def cp_remove(cp_id): +# return json.dumps({'result':fos_api.network.delete_connection_point(cp_id)}) # FDU -@app.route('/fdu/onboard', methods=['POST']) -def fdu_onboard(): - data = request.data - if isinstance(data,bytes): - data = data.decode() - descriptor = json.loads(data) - return json.dumps({'result':fos_api.fdu.onboard(descriptor)}) - - -@app.route('/fdu/offload/', methods=['DELETE']) -def fdu_offload(fdu_id): - return json.dumps({'result':fos_api.fdu.offload(fdu_id)}) - - -@app.route('/fdu/define//', methods=['POST']) -def fdu_define(fdu_id, node_id): +@app.route('/fdu//info', methods=['GET','DELETE','PUT']) +def fdu(fduid): + + # try: + # res = json.dumps(fos_api.network.remove_network_from_node(net_id, node)) + # except ValueError as ve: + # return json.dumps({'error':'{}'.format(ve)}) + # return res + method = request.method + if method == 'GET': + try: + res = fos_api.fdu.info(fduid) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return json.dumps(res.to_json()) + elif method == 'PUT': + data = request.data + if isinstance(data,bytes): + data = data.decode() + descriptor = json.loads(data) + try: + res = json.dumps(fos_api.fdu.onboard(descriptor)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res + elif method == 'DELETE': + try: + res = json.dumps(fos_api.fdu.offload(fduid)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res + +@app.route('/fdu/{}/schedule', methods=['PUT']) +def fdu_define(fduid): try: - return json.dumps({'result':fos_api.fdu.define(fdu_id, node_id)}) - except ValueError as ve: + res = fos_api.fdu.define(fduid) + except Exception as ve: return json.dumps({'error':'{}'.format(ve)}) + return json.dumps(res.to_json()) -@app.route('/fdu/undefine/', methods=['DELETE']) -def fdu_undefine(instanceid): - return json.dumps({'result':fos_api.fdu.undefine(instanceid)}) - - -@app.route('/fdu/configure/', methods=['POST']) -def fdu_configure(instanceid): +@app.route('/nodes///define', methods=['PUT']) +def fdu_define_node(node, fduid): try: - return json.dumps({'result':fos_api.fdu.configure(instanceid)}) - except ValueError as ve: + res = fos_api.fdu.define(fduid, node) + except Exception as ve: return json.dumps({'error':'{}'.format(ve)}) + return json.dumps(res.to_json()) -@app.route('/fdu/clean/', methods=['POST']) -def fdu_clean(instanceid): - try: - return json.dumps({'result':fos_api.fdu.clean(instanceid)}) - except ValueError as ve: - return json.dumps({'error':'{}'.format(ve)}) +@app.route('/fdu/instances//info', methods=['GET','DELETE']) +def fdu_instance(instance): + method = request.method + if method == 'GET': + try: + res = fos_api.fdu.instance_info(instance) + except Exception as ve: + return json.dumps({'error':'{}'.format(ve)}) + return json.dumps(res.to_json()) + elif method == 'DELETE': + try: + res = json.dumps(fos_api.fdu.undefine(instance)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res -@app.route('/fdu/start/', methods=['POST']) -def fdu_run(instanceid): - try: - return json.dumps({'result':fos_api.fdu.start(instanceid)}) - except ValueError as ve: - return json.dumps({'error':'{}'.format(ve)}) -@app.route('/fdu/stop/', methods=['POST']) -def fdu_stop(instanceid): - try: - return json.dumps({'result':fos_api.fdu.stop(instanceid)}) - except ValueError as ve: - return json.dumps({'error':'{}'.format(ve)}) -@app.route('/fdu/pause/', methods=['POST']) -def fdu_pause(instanceid): +@app.route('/fdu/instances//configure', methods=['POST']) +def fdu_instance_configure(instance): try: - return json.dumps({'result':fos_api.fdu.pause(instanceid)}) - except ValueError as ve: - return json.dumps({'error':'{}'.format(ve)}) + res = json.dumps(fos_api.fdu.configure(instance)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res -@app.route('/fdu/resume/', methods=['POST']) -def fdu_resume(instanceid): +@app.route('/fdu/instances//clean', methods=['POST']) +def fdu_instance_clean(instance): try: - return json.dumps({'result':fos_api.fdu.resume(instanceid)}) - except ValueError as ve: - return json.dumps({'error':'{}'.format(ve)}) - + res = json.dumps(fos_api.fdu.clean(instance)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res -@app.route('/fdu/migrate//', methods=['POST']) -def fdu_migrate(instanceid ,destinationid): +@app.route('/fdu/instances//start', methods=['POST']) +def fdu_instance_start(instance): try: - return json.dumps({'result':fos_api.fdu.migrate(instanceid, destinationid)}) - except ValueError as ve: - return json.dumps({'error':'{}'.format(ve)}) + env = request.data + if isinstance(env,bytes): + env = env.decode() + res = json.dumps(fos_api.fdu.start(instance, env)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res -@app.route('/fdu/instantiate//', methods=['POST']) -def fdu_instantiate(fdu_id, node_id): +@app.route('/fdu/instances//stop', methods=['POST']) +def fdu_instance_stop(instance): try: - return json.dumps({'result':fos_api.fdu.instantiate(fdu_id, node_id)}) - except ValueError as ve: - return json.dumps({'error':'{}'.format(ve)}) - + res = json.dumps(fos_api.fdu.stop(instance)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res -@app.route('/fdu/terminate/', methods=['POST']) -def fdu_terminate(instanceid): +@app.route('/fdu/instances//pause', methods=['POST']) +def fdu_instance_pause(instance): try: - return json.dumps({'result':fos_api.fdu.terminate(instanceid)}) - except ValueError as ve: - return json.dumps({'error':'{}'.format(ve)}) + res = json.dumps(fos_api.fdu.pause(instance)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res +@app.route('/fdu/instances//resume', methods=['POST']) +def fdu_instance_resume(instance): + try: + res = json.dumps(fos_api.fdu.resume(instance)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res -@app.route('/fdu/get_nodes/', methods=['GET']) -def fdu_get_nodes(fdu_id): - return json.dumps(fos_api.fdu.get_nodes(fdu_id)) +@app.route('/fdu/instances//migrate/', methods=['POST']) +def fdu_instance_resume(instance, destination): + try: + res = json.dumps(fos_api.fdu.migrate(instance, destination)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res -@app.route('/fdu/list_node/', methods=['GET']) -def fdu_node_list(node_id): - return json.dumps(fos_api.fdu.list_node(node_id)) +@app.route('/fdu//nodes/list', methods=['GET']) +def fdu_get_nodes(fdu): + return json.dumps(fos_api.fdu.get_nodes(fdu)) -@app.route('/fdu/info/', methods=['GET']) -def fdu_info(fdu_id): - return json.dumps(fos_api.fdu.info(fdu_id)) +@app.route('/nodes//fdu/list', methods=['GET']) +def fdu_node_list(node): + return json.dumps(fos_api.fdu.list_node(node)) -@app.route('/fdu/instance_info/', methods=['GET']) -def fdu_instance_info(instanceid): - return json.dumps(fos_api.fdu.instance_info(instanceid)) -@app.route('/fdu/instance_list/', methods=['GET']) -def fdu_instance_list(fdu_id): - return json.dumps(fos_api.fdu.instance_list(fdu_id)) +@app.route('/fdu//instances/list', methods=['GET']) +def fdu_instance_list(fdu): + return json.dumps(fos_api.fdu.instance_list(fdu)) @app.route('/fdu/list', methods=['GET']) @@ -212,84 +263,72 @@ def fdu_list(): # IMAGE -@app.route('/image/add', methods=['POST']) -def image_add(): - if 'descriptor' not in request.files: - abort(403) - if 'image' not in request.files: - abort(403) - - desc_file = request.files['descriptor'] - desc_filename = desc_file.filename - desc_path = os.path.join(conf.get('image_path'), desc_filename) - desc_file.save(desc_path) - descriptor = json.loads(read_file(desc_path)) - - img_file = request.files['image'] - img_filename = img_file.filename - img_path = os.path.join(conf.get('image_path'), img_filename) - img_file.save(img_path) - img_dict.update({descriptor.get('uuid'):img_filename}) - uri = 'http://{}:{}{}'.format( conf['host'], conf['port'],url_for('get_image_file',fname=img_filename)) - descriptor.update({'uri':uri}) - return json.dumps({'result':fos_api.image.add(descriptor)}) - - -@app.route('/image/', methods=['GET']) -def image_get(img_id): - return json.dumps(fos_api.image.get(img_id)) - - -@app.route('/image/list', methods=['GET']) +@app.route('/images//info', methods=['GET','PUT','DELETE']) +def image(imgid): + + method = request.method + if method == 'GET': + try: + return json.dumps(fos_api.image.get(imgid)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + elif method == 'PUT': + data = request.data + if isinstance(data,bytes): + data = data.decode() + descriptor = json.loads(data) + try: + res = json.dumps(fos_api.image.add(descriptor)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res + elif method == 'DELETE': + try: + res = json.dumps(fos_api.fdu.remove(imgid)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res + + +@app.route('/images/list', methods=['GET']) def image_list(): return json.dumps(fos_api.image.list()) -@app.route('/image/remove/', methods=['DELETE']) -def image_remove(img_id): - if img_id not in img_dict: - abort(404) - else: - f_name = img_dict.pop(img_id) - if os.path.isfile(os.path.join(conf.get('image_path'), f_name)): - os.remove(os.path.join(conf.get('image_path'), f_name)) - if os.path.isfile(os.path.join(conf.get('image_path'), '{}.json'.format(img_id))): - os.remove(os.path.join(conf.get('image_path'), '{}.json'.format(img_id))) - return json.dumps({'result':fos_api.image.remove(img_id)}) - - -@app.route('/image/file/', methods=['GET']) -def get_image_file(fname): - return send_from_directory(conf.get('image_path'), fname) - #FLAVOR - -@app.route('/flavor/add', methods=['POST']) -def flavor_add(): - data = request.data - if isinstance(data,bytes): - data = data.decode() - descriptor = json.loads(data) - return json.dumps({'result':fos_api.flavor.add(descriptor)}) - - -@app.route('/flavor/', methods=['GET']) -def flavor_get(flv_id): - return json.dumps(fos_api.flavor.get(flv_id)) - - -@app.route('/flavor/list', methods=['GET']) +@app.route('/flavors//info', methods=['GET','PUT','DELETE']) +def flavor(flv_id): + + method = request.method + if method == 'GET': + try: + return json.dumps(fos_api.flavor.get(flv_id)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + elif method == 'PUT': + data = request.data + if isinstance(data,bytes): + data = data.decode() + descriptor = json.loads(data) + try: + res = json.dumps(fos_api.flavor.add(descriptor)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res + elif method == 'DELETE': + try: + res = json.dumps(fos_api.fdu.flavor(flv_id)) + except Exception as e: + return json.dumps({'error':'{}'.format(e)}) + return res + + +@app.route('/flavors/list', methods=['GET']) def flavor_list(): return json.dumps(fos_api.flavor.list()) -@app.route('/flavor/', methods=['DELETE']) -def flavor_remove(flv_id): - fos_api.flavor.remove(flv_id) - return json.dumps({'result':True}) - - # MAIN and UTILS def read_file(file_path): From 7315ea5b8ee5a8193065df89fa86721a5863994b Mon Sep 17 00:00:00 2001 From: gabrik Date: Mon, 8 Jun 2020 12:28:08 +0200 Subject: [PATCH 3/4] remove submodules --- .gitmodules | 42 ---------------------------------- api/api-go | 1 - api/api-ocaml | 1 - api/api-python | 1 - plugins/plugin-fdu-containerd | 1 - plugins/plugin-fdu-kvm | 1 - plugins/plugin-fdu-lxd | 1 - plugins/plugin-fdu-native | 1 - plugins/plugin-net-linuxbridge | 1 - plugins/plugin-os-linux | 1 - sdk/sdk-go | 1 - sdk/sdk-ocaml | 1 - sdk/sdk-python | 1 - src/agent | 1 - 14 files changed, 55 deletions(-) delete mode 160000 api/api-go delete mode 160000 api/api-ocaml delete mode 160000 api/api-python delete mode 160000 plugins/plugin-fdu-containerd delete mode 160000 plugins/plugin-fdu-kvm delete mode 160000 plugins/plugin-fdu-lxd delete mode 160000 plugins/plugin-fdu-native delete mode 160000 plugins/plugin-net-linuxbridge delete mode 160000 plugins/plugin-os-linux delete mode 160000 sdk/sdk-go delete mode 160000 sdk/sdk-ocaml delete mode 160000 sdk/sdk-python delete mode 160000 src/agent diff --git a/.gitmodules b/.gitmodules index 1aabc01f..8b137891 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,43 +1 @@ -[submodule "plugins/plugin-os-linux"] - path = plugins/plugin-os-linux - url = https://github.com/eclipse-fog05/plugin-os-linux -[submodule "plugins/plugin-net-linuxbridge"] - path = plugins/plugin-net-linuxbridge - url = https://github.com/eclipse-fog05/plugin-net-linuxbridge -[submodule "plugins/plugin-fdu-kvm"] - path = plugins/plugin-fdu-kvm - url = https://github.com/eclipse-fog05/plugin-fdu-kvm -[submodule "plugins/plugin-fdu-native"] - path = plugins/plugin-fdu-native - url = https://github.com/eclipse-fog05/plugin-fdu-native -[submodule "plugins/plugin-fdu-lxd"] - path = plugins/plugin-fdu-lxd - url = https://github.com/eclipse-fog05/plugin-fdu-lxd -[submodule "sdk/sdk-go"] - path = sdk/sdk-go - url = https://github.com/eclipse-fog05/sdk-go -[submodule "sdk/sdk-ocaml"] - path = sdk/sdk-ocaml - url = https://github.com/eclipse-fog05/sdk-ocaml -[submodule "sdk/sdk-python"] - path = sdk/sdk-python - url = https://github.com/eclipse-fog05/sdk-python -[submodule "api/api-go"] - path = api/api-go - url = https://github.com/eclipse-fog05/api-go -[submodule "api/api-python"] - path = api/api-python - url = https://github.com/eclipse-fog05/api-python -[submodule "src/agent"] - path = src/agent - url = https://github.com/eclipse-fog05/agent -[submodule "api/api-ocaml"] - path = api/api-ocaml - url = https://github.com/eclipse-fog05/api-ocaml -[submodule "plugins/plugin-fdu-containerd"] - path = plugins/plugin-fdu-containerd - url = https://github.com/eclipse-fog05/plugin-fdu-containerd -[submodule "plugins/plugin-fdu-ros2"] - path = plugins/plugin-fdu-ros2 - url = https://github.com/eclipse-fog05/plugin-fdu-ros2 diff --git a/api/api-go b/api/api-go deleted file mode 160000 index fe5dbcef..00000000 --- a/api/api-go +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fe5dbcef93e7580160c4fd10ed80cda5fcc2b10a diff --git a/api/api-ocaml b/api/api-ocaml deleted file mode 160000 index 0a62e5b0..00000000 --- a/api/api-ocaml +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0a62e5b018925b92fa2b6dd6da7dd148f0d59699 diff --git a/api/api-python b/api/api-python deleted file mode 160000 index ff4ccbda..00000000 --- a/api/api-python +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ff4ccbda765ef432bb53e4b567a66ce3efce09fa diff --git a/plugins/plugin-fdu-containerd b/plugins/plugin-fdu-containerd deleted file mode 160000 index 4bdc03c2..00000000 --- a/plugins/plugin-fdu-containerd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4bdc03c24b07f971afdbf866444bccbe8b990db4 diff --git a/plugins/plugin-fdu-kvm b/plugins/plugin-fdu-kvm deleted file mode 160000 index 1c723183..00000000 --- a/plugins/plugin-fdu-kvm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c7231832b30a3bddd2101d20f2260cb29caeb71 diff --git a/plugins/plugin-fdu-lxd b/plugins/plugin-fdu-lxd deleted file mode 160000 index ef419fb0..00000000 --- a/plugins/plugin-fdu-lxd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ef419fb0c039f91d2958183a9e4c71a43c81365c diff --git a/plugins/plugin-fdu-native b/plugins/plugin-fdu-native deleted file mode 160000 index 2bd3bb78..00000000 --- a/plugins/plugin-fdu-native +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2bd3bb7876f9601d9a7a08990584fffbebd857b1 diff --git a/plugins/plugin-net-linuxbridge b/plugins/plugin-net-linuxbridge deleted file mode 160000 index bd9c7584..00000000 --- a/plugins/plugin-net-linuxbridge +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd9c75848767c2a21954adfceffdd95d8e1684e5 diff --git a/plugins/plugin-os-linux b/plugins/plugin-os-linux deleted file mode 160000 index 008fd6ca..00000000 --- a/plugins/plugin-os-linux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 008fd6ca7b04e57163bde24397d4fe618c4e7678 diff --git a/sdk/sdk-go b/sdk/sdk-go deleted file mode 160000 index c44c74a2..00000000 --- a/sdk/sdk-go +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c44c74a25330df4731f16f159a2a648663dc2601 diff --git a/sdk/sdk-ocaml b/sdk/sdk-ocaml deleted file mode 160000 index a7aff8b9..00000000 --- a/sdk/sdk-ocaml +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a7aff8b9aa4c713b1cc61e1eb10d6b5e5aa46244 diff --git a/sdk/sdk-python b/sdk/sdk-python deleted file mode 160000 index ef2f3df1..00000000 --- a/sdk/sdk-python +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ef2f3df1cb9de780f020df66ac1c5ef93aace181 diff --git a/src/agent b/src/agent deleted file mode 160000 index c2499349..00000000 --- a/src/agent +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c2499349b2656f33720e1cb8313fb808c8f77177 From 42bc9dbaffb47a1e18b0c48331d66e280101faa5 Mon Sep 17 00:00:00 2001 From: gabrik Date: Mon, 8 Jun 2020 12:40:04 +0200 Subject: [PATCH 4/4] added correct submodules Signed-off-by: gabrik --- .gitmodules | 42 ++++++++++++++++++++++++++++++++++ api/api-go | 1 + api/api-ocaml | 1 + api/api-python | 1 + plugins/plugin-fdu-containerd | 1 + plugins/plugin-fdu-kvm | 1 + plugins/plugin-fdu-lxd | 1 + plugins/plugin-fdu-native | 1 + plugins/plugin-fdu-ros2 | 1 + plugins/plugin-net-linuxbridge | 1 + plugins/plugin-os-linux | 1 + sdk/sdk-go | 1 + sdk/sdk-ocaml | 1 + sdk/sdk-python | 1 + src/agent | 1 + 15 files changed, 56 insertions(+) create mode 160000 api/api-go create mode 160000 api/api-ocaml create mode 160000 api/api-python create mode 160000 plugins/plugin-fdu-containerd create mode 160000 plugins/plugin-fdu-kvm create mode 160000 plugins/plugin-fdu-lxd create mode 160000 plugins/plugin-fdu-native create mode 160000 plugins/plugin-fdu-ros2 create mode 160000 plugins/plugin-net-linuxbridge create mode 160000 plugins/plugin-os-linux create mode 160000 sdk/sdk-go create mode 160000 sdk/sdk-ocaml create mode 160000 sdk/sdk-python create mode 160000 src/agent diff --git a/.gitmodules b/.gitmodules index 8b137891..cecb63ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1 +1,43 @@ +[submodule "src/agent"] + path = src/agent + url = https://github.com/eclipse-fog05/agent +[submodule "sdk/sdk-ocaml"] + path = sdk/sdk-ocaml + url = https://github.com/eclipse-fog05/sdk-ocaml +[submodule "sdk/sdk-go"] + path = sdk/sdk-go + url = https://github.com/eclipse-fog05/sdk-go +[submodule "sdk/sdk-python"] + path = sdk/sdk-python + url = https://github.com/eclipse-fog05/sdk-python +[submodule "api/api-ocaml"] + path = api/api-ocaml + url = https://github.com/eclipse-fog05/api-ocaml +[submodule "api/api-python"] + path = api/api-python + url = https://github.com/eclipse-fog05/api-python +[submodule "api/api-go"] + path = api/api-go + url = https://github.com/eclipse-fog05/api-go +[submodule "plugins/plugin-os-linux"] + path = plugins/plugin-os-linux + url = https://github.com/eclipse-fog05/plugin-os-linux +[submodule "plugins/plugin-net-linuxbridge"] + path = plugins/plugin-net-linuxbridge + url = https://github.com/eclipse-fog05/plugin-net-linuxbridge +[submodule "plugins/plugin-fdu-native"] + path = plugins/plugin-fdu-native + url = https://github.com/eclipse-fog05/plugin-fdu-native +[submodule "plugins/plugin-fdu-lxd"] + path = plugins/plugin-fdu-lxd + url = https://github.com/eclipse-fog05/plugin-fdu-lxd +[submodule "plugins/plugin-fdu-kvm"] + path = plugins/plugin-fdu-kvm + url = https://github.com/eclipse-fog05/plugin-fdu-kvm +[submodule "plugins/plugin-fdu-ros2"] + path = plugins/plugin-fdu-ros2 + url = https://github.com/eclipse-fog05/plugin-fdu-ros2 +[submodule "plugins/plugin-fdu-containerd"] + path = plugins/plugin-fdu-containerd + url = https://github.com/eclipse-fog05/plugin-fdu-containerd diff --git a/api/api-go b/api/api-go new file mode 160000 index 00000000..8da66876 --- /dev/null +++ b/api/api-go @@ -0,0 +1 @@ +Subproject commit 8da6687672bb45042849309ed52ac7c831bbed92 diff --git a/api/api-ocaml b/api/api-ocaml new file mode 160000 index 00000000..b28461ea --- /dev/null +++ b/api/api-ocaml @@ -0,0 +1 @@ +Subproject commit b28461ea8fd8113f65a7f021df1a318e324d9ab8 diff --git a/api/api-python b/api/api-python new file mode 160000 index 00000000..1d954822 --- /dev/null +++ b/api/api-python @@ -0,0 +1 @@ +Subproject commit 1d954822d6d2d5ac21226cf362d07256bcee0667 diff --git a/plugins/plugin-fdu-containerd b/plugins/plugin-fdu-containerd new file mode 160000 index 00000000..cde94a8d --- /dev/null +++ b/plugins/plugin-fdu-containerd @@ -0,0 +1 @@ +Subproject commit cde94a8d0cf6c124303aa10561a84e9cc64f155d diff --git a/plugins/plugin-fdu-kvm b/plugins/plugin-fdu-kvm new file mode 160000 index 00000000..98a9369f --- /dev/null +++ b/plugins/plugin-fdu-kvm @@ -0,0 +1 @@ +Subproject commit 98a9369fcec25b854132cb6bf6ac21d6b341d6f1 diff --git a/plugins/plugin-fdu-lxd b/plugins/plugin-fdu-lxd new file mode 160000 index 00000000..d3882625 --- /dev/null +++ b/plugins/plugin-fdu-lxd @@ -0,0 +1 @@ +Subproject commit d38826253e587daec04218be3de053fae8e9dd80 diff --git a/plugins/plugin-fdu-native b/plugins/plugin-fdu-native new file mode 160000 index 00000000..5960a673 --- /dev/null +++ b/plugins/plugin-fdu-native @@ -0,0 +1 @@ +Subproject commit 5960a6737ef19203587bcfd1e468e3a44aaad240 diff --git a/plugins/plugin-fdu-ros2 b/plugins/plugin-fdu-ros2 new file mode 160000 index 00000000..c2bf1266 --- /dev/null +++ b/plugins/plugin-fdu-ros2 @@ -0,0 +1 @@ +Subproject commit c2bf1266d5c0182f79e474b8b05fba71d036f096 diff --git a/plugins/plugin-net-linuxbridge b/plugins/plugin-net-linuxbridge new file mode 160000 index 00000000..2618379b --- /dev/null +++ b/plugins/plugin-net-linuxbridge @@ -0,0 +1 @@ +Subproject commit 2618379b145d88e69fcbe57166eef5bcacade459 diff --git a/plugins/plugin-os-linux b/plugins/plugin-os-linux new file mode 160000 index 00000000..008fd6ca --- /dev/null +++ b/plugins/plugin-os-linux @@ -0,0 +1 @@ +Subproject commit 008fd6ca7b04e57163bde24397d4fe618c4e7678 diff --git a/sdk/sdk-go b/sdk/sdk-go new file mode 160000 index 00000000..bd74ddb7 --- /dev/null +++ b/sdk/sdk-go @@ -0,0 +1 @@ +Subproject commit bd74ddb7a6629f4f9026f81c1cbcc58e022b5dc6 diff --git a/sdk/sdk-ocaml b/sdk/sdk-ocaml new file mode 160000 index 00000000..6d431984 --- /dev/null +++ b/sdk/sdk-ocaml @@ -0,0 +1 @@ +Subproject commit 6d431984bb23a54191aacd2c6c7719933bdce14e diff --git a/sdk/sdk-python b/sdk/sdk-python new file mode 160000 index 00000000..e3498298 --- /dev/null +++ b/sdk/sdk-python @@ -0,0 +1 @@ +Subproject commit e349829856a15c4287ae65245bb4ff9ee4572786 diff --git a/src/agent b/src/agent new file mode 160000 index 00000000..a06593c6 --- /dev/null +++ b/src/agent @@ -0,0 +1 @@ +Subproject commit a06593c635cc3559d7c4492eb1a4545eb38da8c5