Skip to content

C
CONF
Commit 09fd2c95 authored by Spiros Koulouzis's avatar Spiros Koulouzis
Browse files
Options

fixed all parsing errors

parent 3787c955
Show whitespace changes
Inline Side-by-side
Showing with 458 additions and 503 deletions
docs/composer_files/stack_monitoring.yml
View file @ 09fd2c95
version: '3' version: '3'
services: services:
server: server:
image: salmant/ul_monitoring_server_container_image2 image: salmant/ul_monitoring_server_container_image2
ports: ports:
- "8080:8080/tcp" - "8080:8080"
- "4242:4242"
- "4245:4245"
- "7199:7199"
- "7000:7000"
- "7001:7001"
- "9160:9160"
- "9042:9042"
- "8012:8012"
- "61621:61621"
environment:
- "MONITORING_SERVER=server"
agent: agent:
image: salmant/monitoring_agent image: salmant/monitoring_agent
deploy: deploy: {replicas: 10}
replicas: 20 depends_on: [server]
depends_on:
- server
command: --monitoringServerIP=server command: --monitoringServerIP=server
docs/input_tosca_files/BEIA_cardif2.yml
View file @ 09fd2c95
topology_template: topology_template:
node_templates: node_templates:
"AlertChecker": "e070e007-e6bb-4dbc-9a4c-dcc19cfe9894":
artifacts: type: "Switch.nodes.Application.Container.Docker.VLAD_WebUI"
"alertchecker_image":
type: "tosca.artifacts.Deployment.Image.Container.Docker"
file: "beia/alerter"
repository: SWITCH_docker_hub
requirements:
- host:
node_filter:
capabilities:
host:
cpu_frequency: 1GHz
mem_size: 1GB
num_cpus: 1
disk_size: 1GB
os:
os_version: 16.04
distribution: ubuntu
type: linux
architecture: x86_64
type: "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_InputDistributor.Cardiff"
properties: properties:
scaling_mode: single
QoS:
packet_loss: 0
response_time: 30ms
out_ports: out_ports:
"24ba657c-8a18-4c7f-aed9-9498d88a85d2": "3b0de457-1be2-46e8-824e-a2adbc5b2190":
type: out type: out
port: " 1 " port: " ui "
multicastAddrPort: 3000
inPort: 2000
in_ports: in_ports:
"92aa59bd-2c48-4f25-a27f-1412dd2cc849": "e6a65125-5bf7-4f96-882c-2e7a739b9684":
type: in type: in
port: " inPort " port: " config "
waitingTime: 5
multicastAddrIP: "225.2.2.0"
ports_mapping: ports_mapping:
port_mapping_1:
host_port: SET_ITS_VALUE
container_port: SET_ITS_VALUE
port_mapping_0: port_mapping_0:
host_port: "${inPort}" host_port: SET_ITS_VALUE
container_port: "${inPort}" container_port: SET_ITS_VALUE
"573924ff-c075-4dfc-95c4-489e0a189040": port_mapping_2:
host_port: SET_ITS_VALUE
container_port: SET_ITS_VALUE
scaling_mode: single
"fedbbfd7-e514-4098-9311-f674081e61b7":
artifacts: artifacts:
"inputdistributor.cardiff_image": alertchecker_image:
type: "tosca.artifacts.Deployment.Image.Container.Docker" type: "tosca.artifacts.Deployment.Image.Container.Docker"
file: "mogswitch/InputDistributor:1.0" file: "beia/alerter"
repository: SWITCH_docker_hub repository: SWITCH_docker_hub
requirements: type: "Switch.nodes.Application.Container.Docker.VLAD_AlertChecker"
- host:
node_filter:
capabilities:
host:
cpu_frequency: 1GHz
mem_size: 1GB
num_cpus: 1
disk_size: 1GB
os:
os_version: 16.04
distribution: ubuntu
type: linux
architecture: x86_64
type: "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_InputDistributor.Cardiff"
properties: properties:
Environment:
CONFIG: config_manager
in_ports:
"4e2df074-134c-46d0-803c-559de8c15d0c":
type: in
port: " data "
"5c0239a2-b96b-4b47-a0df-602e2642e645":
type: in
port: " ui "
"08201583-3180-4a54-b65c-b953eeea223f":
type: in
port: " config "
scaling_mode: single scaling_mode: single
QoS:
packet_loss: 0
response_time: 30ms
out_ports: out_ports:
"030029d5-63ef-472f-9697-df1380505281": "a33bd342-3a80-4e8e-bf56-b1cfe198759f":
type: out type: out
port: " 1 " port: " notification "
multicastAddrPort: 3000 "fb64a154-7e2d-4aa3-a48a-cf36985cf2cb":
inPort: 2000 type: "Switch.nodes.Application.Container.Docker.VLAD_SIPNotifier"
in_ports:
"40974a48-8bcb-48ba-80a6-4d3c5f26f502":
type: in
port: " inPort "
waitingTime: 5
multicastAddrIP: "225.2.2.2"
ports_mapping:
port_mapping_0:
host_port: "${multicastAddrPort}"
container_port: "${multicastAddrPort}"
"8bc5abcb-ae55-4f82-adc6-21d4a2475381":
type: "Switch.nodes.Application.Connection"
properties:
latency: 20ms
bandwidth: 1Gb
target:
netmask: ""
component_name: "8b5621b5-fbe9-4f4a-b68a-57b00cb07b6a"
port_name: "52d0aa2c-0775-44b1-857e-006817a3d637"
address: ""
source:
netmask: ""
component_name: "573924ff-c075-4dfc-95c4-489e0a189040"
port_name: "030029d5-63ef-472f-9697-df1380505281"
address: ""
"f9a17d09-d8bd-4f95-962a-3d86d71d1332":
type: "Switch.nodes.Application.Connection"
properties:
latency: 20ms
bandwidth: 1Gb
target:
netmask: ""
component_name: "8bffa661-cfa4-49df-ad83-7eba8498b405"
port_name: "2e50ce74-9396-4058-8402-997d196c9fd7"
address: ""
source:
netmask: ""
component_name: "573924ff-c075-4dfc-95c4-489e0a189040"
port_name: "030029d5-63ef-472f-9697-df1380505281"
address: ""
"a52c6766-6805-4c62-ab71-e2353388d4d5":
type: "Switch.nodes.Application.Connection"
properties:
latency: 20ms
bandwidth: 1Gb
target:
netmask: ""
component_name: "432dc3f6-4d1c-4092-a365-7837ef92279c"
port_name: "7c36b4c1-58e1-4011-b00f-7641e09b2e5a"
address: ""
source:
netmask: ""
component_name: "8b5621b5-fbe9-4f4a-b68a-57b00cb07b6a"
port_name: "88d8db9a-7621-440c-8c80-370a2020b810"
address: ""
"bce936d3-fee5-4217-9c44-710e78c94a70":
type: "Switch.nodes.Application.Connection"
properties:
latency: 20ms
bandwidth: 1Gb
target:
netmask: ""
component_name: "8b5621b5-fbe9-4f4a-b68a-57b00cb07b6a"
port_name: "a75bc9ef-b485-4db7-8226-9c3d76ae8a9e"
address: ""
source:
netmask: ""
component_name: "6be727ce-5fa1-4e6d-9a37-438d0ec94ff0"
port_name: "24ba657c-8a18-4c7f-aed9-9498d88a85d2"
address: ""
"8b5621b5-fbe9-4f4a-b68a-57b00cb07b6a":
requirements:
- host:
node_filter:
capabilities:
host:
cpu_frequency: 3Ghz
mem_size: 1GB
num_cpus: 1
disk_size: 1GB
os:
os_version: 16.04
distribution: ubuntu
type: linux
architecture: x86_64
type: "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_Switcher.Cardiff"
properties: properties:
scaling_mode: single
QoS:
packet_loss: 0
response_time: 30ms
switcherOutAddrIP: "226.2.2.2"
multicastAddrPort: 3000
multicastAddrPort2: 3002
in_ports: in_ports:
"a75bc9ef-b485-4db7-8226-9c3d76ae8a9e": "d268399d-6cb5-4f26-923a-9d5b6d123fa3":
type: in
port: " switcherREST "
"62bdc6c5-b179-4661-bda7-a5f94ee17247":
type: in
port: " 3 "
"52d0aa2c-0775-44b1-857e-006817a3d637":
type: in type: in
port: " 2 " port: " notification "
waitingTime: 5
multicastAddrIP: "225.2.2.0"
switcherOutAddrPort: 6000
multicastAddrIP2: "225.2.2.2"
switcherREST: 8008
out_ports: out_ports:
"88d8db9a-7621-440c-8c80-370a2020b810": "89208fa1-731e-4048-9497-f9dbc70eaa1c":
type: out type: out
port: " 1 " port: " redis "
ports_mapping: ports_mapping:
port_mapping_1:
host_port: SET_ITS_VALUE
container_port: SET_ITS_VALUE
port_mapping_0: port_mapping_0:
host_port: "${switcherREST}" host_port: SET_ITS_VALUE
container_port: "${switcherREST}" container_port: SET_ITS_VALUE
videoWidth: 176 port_mapping_2:
videoHeight: 100 host_port: SET_ITS_VALUE
"5a7c790f-e0cd-4eae-9145-85d2d9aadc66": container_port: SET_ITS_VALUE
type: "Switch.nodes.Application.Connection"
properties:
latency: 20ms
bandwidth: 1Gb
target:
netmask: ""
component_name: "7855f235-7cd8-4091-8acc-f1df70bae6e2"
port_name: "4e52e9f4-19d2-4b32-96ee-67bd5775ab93"
address: ""
source:
netmask: ""
component_name: "8b5621b5-fbe9-4f4a-b68a-57b00cb07b6a"
port_name: "88d8db9a-7621-440c-8c80-370a2020b810"
address: ""
"7855f235-7cd8-4091-8acc-f1df70bae6e2":
requirements:
- host:
node_filter:
capabilities:
host:
cpu_frequency: 3GHz
mem_size: 1GB
num_cpus: 2
disk_size: 1GB
os:
os_version: 16.04
distribution: ubuntu
type: linux
architecture: x86_64
type: "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_ProxyTranscoder"
properties:
scaling_mode: single scaling_mode: single
QoS: "7b03645e-8a1a-4c8a-8856-dbb7cacc2e8c":
packet_loss: 0 type: "Switch.nodes.Application.Container.Docker.VLAD_WebUI"
response_time: 30ms properties:
out_ports: out_ports:
"60eea86c-64ed-48da-b991-6bf7c49c861c": "515656e4-f1b2-487f-bedb-7f5e02fcd7b2":
type: out type: out
port: " outPort " port: " ui "
multicastAddrPort: 3000
in_ports: in_ports:
"4e52e9f4-19d2-4b32-96ee-67bd5775ab93": "97abfd82-7866-45d1-b3f7-8d75ef5b276d":
type: in type: in
port: " 1 " port: " config "
multicastAddrIP: "225.2.2.0"
ports_mapping: ports_mapping:
port_mapping_0:
host_port: 8085
container_port: 80
port_mapping_1: port_mapping_1:
host_port: 8086 host_port: SET_ITS_VALUE
container_port: 81 container_port: SET_ITS_VALUE
"849ea5ba-9938-46aa-8d3d-d525f5d87102": port_mapping_0:
type: "Switch.nodes.Application.Connection" host_port: SET_ITS_VALUE
properties: container_port: SET_ITS_VALUE
latency: 20ms port_mapping_2:
bandwidth: 1Gb host_port: SET_ITS_VALUE
target: container_port: SET_ITS_VALUE
netmask: ""
component_name: "58ed77c3-8397-4e27-a4ab-0be0fee0569c"
port_name: "6f14898d-007d-419c-a41b-02099611f77f"
address: ""
source:
netmask: ""
component_name: "6be727ce-5fa1-4e6d-9a37-438d0ec94ff0"
port_name: "24ba657c-8a18-4c7f-aed9-9498d88a85d2"
address: ""
"8bffa661-cfa4-49df-ad83-7eba8498b405":
requirements:
- host:
node_filter:
capabilities:
host:
cpu_frequency: 3GHz
mem_size: 1GB
num_cpus: 2
disk_size: 1GB
os:
os_version: 16.04
distribution: ubuntu
type: linux
architecture: x86_64
type: "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_ProxyTranscoder"
properties:
scaling_mode: single scaling_mode: single
QoS: "9ab0c544-925c-42dd-ad7a-ada3cf06055f":
packet_loss: 0 type: "Switch.nodes.Application.Container.Docker.VLAD_WebUI"
response_time: 30ms properties:
out_ports: out_ports:
"4bd7ba2b-6f49-4648-9c9c-cdd118e011f3": "8033e0e5-6884-47dd-9882-e53b712b13d7":
type: out type: out
port: " outPort " port: " ui "
multicastAddrPort: 3000
in_ports: in_ports:
"2e50ce74-9396-4058-8402-997d196c9fd7": "920d6849-2c50-49ff-9b85-4cf0a54c2805":
type: in type: in
port: " 1 " port: " config "
multicastAddrIP: "225.2.2.0"
ports_mapping: ports_mapping:
port_mapping_1:
host_port: SET_ITS_VALUE
container_port: SET_ITS_VALUE
port_mapping_0: port_mapping_0:
host_port: 8081 host_port: SET_ITS_VALUE
container_port: 80 container_port: SET_ITS_VALUE
"58ed77c3-8397-4e27-a4ab-0be0fee0569c": port_mapping_2:
host_port: SET_ITS_VALUE
container_port: SET_ITS_VALUE
scaling_mode: single
"2ed5124c-fc43-4759-bfb7-0d69b91c0efd":
artifacts:
monitoring_server_image:
type: "tosca.artifacts.Deployment.Image.Container.Docker"
file: "salmant/salman_monitoring_server_container_image"
repository: SWITCH_docker_hub
requirements: requirements:
- host: - host:
node_filter: node_filter:
capabilities: capabilities:
host: host:
cpu_frequency: 3GHz cpu_frequency: 1.2
mem_size: 1GB mem_size: 4
num_cpus: 2 num_cpus: 1
disk_size: 1GB disk_size: 20
os: os:
os_version: 16.04 os_version: 16.04
distribution: ubuntu distribution: ubuntu
type: linux type: linux
architecture: x86_64 architecture: x86_64
type: "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_ProxyTranscoder" type: "Switch.nodes.Application.Container.Docker.MonitoringServer"
properties: properties:
ports_mapping:
port_mapping_1:
host_port: 4242
container_port: 4242
port_mapping_0:
host_port: 8080
container_port: 8080
port_mapping_3:
host_port: 7199
container_port: 7199
port_mapping_2:
host_port: 4245
container_port: 4245
port_mapping_5:
host_port: 7001
container_port: 7001
port_mapping_4:
host_port: 7000
container_port: 7000
port_mapping_7:
host_port: 9042
container_port: 9042
port_mapping_6:
host_port: 9160
container_port: 9160
port_mapping_9:
host_port: 61621
container_port: 61621
port_mapping_8:
host_port: 8012
container_port: 8012
scaling_mode: single scaling_mode: single
QoS: QoS:
packet_loss: 0 response_time: 50
response_time: 30ms "35624b28-1931-455d-bdad-8b221ac66288":
out_ports: artifacts:
"1e8c4827-5dcc-40c6-840b-f14f09f9ae28": graphite_image:
type: out type: "tosca.artifacts.Deployment.Image.Container.Docker"
port: " outPort " file: "vladwing/graphite"
multicastAddrPort: 3000 repository: SWITCH_docker_hub
type: "Switch.nodes.Application.Container.Docker.VLAD_Graphite"
properties:
Environment:
string_2: SET_ITS_VALUE
string_0: SET_ITS_VALUE
string_1: SET_ITS_VALUE
in_ports: in_ports:
"6f14898d-007d-419c-a41b-02099611f77f": "5268427c-1e1c-46e7-a133-856f4a70ee22":
type: in
port: " ui "
"575070ef-8a16-479a-9933-d6cd083be74c":
type: in type: in
port: " 1 " port: " data "
multicastAddrIP: "225.2.2.2"
ports_mapping: ports_mapping:
port_mapping_1:
host_port: SET_ITS_VALUE
container_port: SET_ITS_VALUE
port_mapping_0: port_mapping_0:
host_port: 8082 host_port: SET_ITS_VALUE
container_port: 80 container_port: SET_ITS_VALUE
"432dc3f6-4d1c-4092-a365-7837ef92279c": port_mapping_2:
requirements: host_port: SET_ITS_VALUE
- host: container_port: SET_ITS_VALUE
node_filter:
capabilities:
host:
cpu_frequency: 3GHz
mem_size: 1GB
num_cpus: 2
disk_size: 1GB
os:
os_version: 16.04
distribution: ubuntu
type: linux
architecture: x86_64
type: "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_OutputTranscoder.Cardiff"
properties:
OutIP: "192.168.1.194"
QoS:
packet_loss: 0
response_time: 30ms
out_ports:
"78fec7a2-e803-4e4a-b5e2-b0afcdb7d3f1":
type: out
port: " outPort "
scaling_mode: single scaling_mode: single
OutPort: 4000 "f2ea0490-1b2d-49f9-9b64-759d2165314c":
artifacts:
data_collector_image:
type: "tosca.artifacts.Deployment.Image.Container.Docker"
file: "beia/data_collector"
repository: SWITCH_docker_hub
type: "Switch.nodes.Application.Container.Docker.VLAD_DataCollector"
properties:
Environment:
string_2: SET_ITS_VALUE
string_0: SET_ITS_VALUE
string_1: SET_ITS_VALUE
in_ports: in_ports:
"7c36b4c1-58e1-4011-b00f-7641e09b2e5a": "e934bc09-8cb4-4b0a-8790-efa8f6e0745d":
type: in type: in
port: " 1 " port: " ui "
ports_mapping: "7edea898-d0eb-43bb-b876-44ba91e23ed8":
port_mapping_0: type: in
host_port: "${OutPort}" port: " config "
container_port: "${OutPort}" scaling_mode: single
videoWidth: 176 out_ports:
videoHeight: 100 "23e7b0d1-65cb-41f5-b7fe-b48e351160e2":
type: out
port: " data "
artifact_types: artifact_types:
"tosca.artifacts.Deployment.Image.Container.Docker": "tosca.artifacts.Deployment.Image.Container.Docker":
derived_from: "tosca.artifacts.Deployment.Image" derived_from: "tosca.artifacts.Deployment.Image"
description: "MOG use case" description: ""
node_types: node_types:
"Switch.nodes.Application.Container.Docker.PEDRO.SANTOS.MOG_Input_Distributor":
properties:
Input_RTP_TS_Port:
default: 2000
type: string
Waiting_Time:
default: 5
type: string
Output_Uncompressed_Video_Multicast_Address:
default: "225.2.2.0"
type: string
Output_Uncompressed_Video_Multicast_Port:
default: "3000 waiting time Waiting time (in seconds) for Input Distributor to receive TS stream 5 switcherOutAddrIP Multicast IP address where Video Switcher"
type: string
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_ProxyTranscoder": "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_ProxyTranscoder":
properties: properties:
multicastAddrPort: multicastAddrPort:
...@@ -403,31 +243,12 @@ node_types: ...@@ -403,31 +243,12 @@ node_types:
required: false required: false
type: string type: string
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Constraint":
requirements:
- monitor_server_endpoint:
node: "Switch.nodes.Application.Container.Docker.MonitoringServer"
capability: "tosca.capabilities.Node"
relationship: "tosca.relationships.DependsOn"
properties:
QoS:
type: "Switch.datatypes.QoS.AppComponent"
derived_from: "tosca.nodes.Root"
"Switch.nodes.Compute":
artifacts:
gateway_image:
type: "tosca.artifacts.Deployment.Image.Container.Docker"
repository: SWITCH_docker_hub
file: "/???"
derived_from: "tosca.nodes.Compute"
"Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_InputDistributor": "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_InputDistributor":
properties: properties:
inPort: inPort:
default: 2000 default: 2000
type: "Switch.datatypes.port" type: "Switch.datatypes.port"
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_V1_RTUSensorDataAcquisitions":
derived_from: "Switch.nodes.Application.Container.Docker"
"tosca.groups.Root": "tosca.groups.Root":
"Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_InputDistributor.Cardiff": "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_InputDistributor.Cardiff":
properties: properties:
...@@ -444,63 +265,58 @@ node_types: ...@@ -444,63 +265,58 @@ node_types:
default: 5 default: 5
type: integer type: integer
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.LOKSORR_SomethingStrange":
artifacts:
somethingstrange_image:
type: "tosca.artifacts.Deployment.Image.Container.Docker"
repository: SWITCH_docker_hub
file: "matej/somethingStrange"
properties:
das:
default: das
type: string
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_Gateway": "Switch.nodes.Application.Container.Docker.BEIA_Gateway":
properties: properties:
Name: Name:
default: BEIA_Gateway default: BEIA_Gateway
type: string type: string
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_RTUSensorDataAcquisition": "Switch.nodes.Application.Container.Docker.BEIA_Acquisition":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Requirement":
properties:
host:
type: "Switch.datatypes.hw.host"
os:
type: "Switch.datatypes.hw.os"
derived_from: "tosca.nodes.Root"
"Switch.nodes.Application.Container.Docker.BEIA_RTUSensorData":
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.MOG_InputDistributor": "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_Switcher.Cardiff":
properties: properties:
waitingTime: waitingTime:
default: 5 default: 5
type: integer type: integer
multicastAddrIP: multicastAddrIP:
default: "255.2.2.0" default: "225.2.2.0"
type: string type: "Switch.datatypes.Network.Multicast"
switcherREST:
default: switcherREST
type: "Switch.datatypes.port"
switcherOutAddrPort:
default: 6000
type: "Switch.datatypes.port"
multicastAddrIP2:
default: "225.2.2.2"
type: "Switch.datatypes.Network.Multicast"
switcherOutAddrIP:
default: "226.2.2.2"
type: "Switch.datatypes.Network.Multicast"
multicastAddrPort: multicastAddrPort:
default: 3000 default: 3000
type: integer type: "Switch.datatypes.port"
videoWidth: videoWidth:
default: 170 default: 176
type: integer
inPort:
default: 2000
type: integer type: integer
multicastAddrPort2:
default: 3002
type: "Switch.datatypes.port"
videoHeight: videoHeight:
default: 100 default: 100
type: integer type: integer
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Connection":
properties:
source:
type: "Switch.datatypes.Application.Connection.EndPoint"
bandwidth:
type: integer
multicast:
type: "Switch.datatypes.Network.Multicast"
jitter:
required: false
type: integer
target:
type: "Switch.datatypes.Application.Connection.EndPoint"
latency:
required: false
type: integer
QoS:
type: "Switch.datatypes.QoS.AppComponent"
derived_from: "tosca.nodes.Root"
"Switch.nodes.Application.Container.Docker": "Switch.nodes.Application.Container.Docker":
properties: properties:
in_ports: in_ports:
...@@ -535,85 +351,30 @@ node_types: ...@@ -535,85 +351,30 @@ node_types:
required: false required: false
type: list type: list
derived_from: "tosca.nodes.Container.Application" derived_from: "tosca.nodes.Container.Application"
"Switch.nodes.Application.Container.Docker.BEIA_V1_RTUSensorDataAcquisition": "Switch.nodes.Application.Container.Docker.BEIA_RTUSensorDataAcquisition":
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.ExternalComponent": "Switch.nodes.Compute":
derived_from: "tosca.nodes.Root" artifacts:
"Switch.nodes.Application.Container.Docker.PEDRO.SANTOS.MOG_Switcher": gateway_image:
properties: type: "tosca.artifacts.Deployment.Image.Container.Docker"
Input_A_Uncompressed_Video_Multicast_Address: repository: SWITCH_docker_hub
default: "225.2.2.0" file: "/???"
type: string derived_from: "tosca.nodes.Compute"
Input_Video_Width:
default: 176
type: string
Input_B_Uncompressed_Video_Multicast_Port:
default: 3002
type: string
Input_B_Uncompressed_Video_Multicast_Address:
default: "225.2.2.1"
type: string
port:
default: 23
type: integer
Output_Uncompressed_Video_Multicast_Address:
default: "226.2.2.2"
type: string
Output_REST_PORT:
default: 8008
type: string
Output_Uncompressed_Video_Multicast_Port:
default: 6000
type: string
Input_Video_Height:
default: 100
type: string
Input_A_Uncompressed_Video_Multicast_Port:
default: 3000
type: string
Waiting_Time:
default: 5
type: string
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.DST":
properties:
dave:
type: string
derived_from: "tosca.nodes.Root"
"Switch.nodes.Application.Container.Docker.BEIA_V1_NotificationServer": "Switch.nodes.Application.Container.Docker.BEIA_V1_NotificationServer":
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.LOKSORR_Bb": "Switch.nodes.Application.Container.Docker.VLAD_AlertChecker":
properties: artifacts:
bb: sipnotifier_image:
type: string type: "tosca.artifacts.Deployment.Image.Container.Docker"
derived_from: "Switch.nodes.Application.Container.Docker" repository: SWITCH_docker_hub
"Switch.nodes.Application.Container.Docker.BEIA_RTUSensorDataManagement": file: "beia/sip_notifier"
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_NotificationServer": "switch.Component.Component.Docker":
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Component":
derived_from: "tosca.nodes.Root"
"Switch.nodes.Network": "Switch.nodes.Network":
derived_from: "tosca.nodes.network.Network" derived_from: "tosca.nodes.network.Network"
"Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_Input": "Switch.nodes.EventListener":
properties: derived_from: "tosca.nodes.Root"
port2:
default: 24
type: integer
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_V1_Monitoring":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.UL_JitsiMeet_docker":
properties:
ips:
type: string
deploy:
type: string
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_Acquisition":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_DB":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_V1_DatabaseServer": "Switch.nodes.Application.Container.Docker.BEIA_V1_DatabaseServer":
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.VirtualNetwork": "Switch.nodes.VirtualNetwork":
...@@ -632,41 +393,18 @@ node_types: ...@@ -632,41 +393,18 @@ node_types:
name: name:
type: string type: string
derived_from: "tosca.nodes.Root" derived_from: "tosca.nodes.Root"
"Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_Switcher.Cardiff": "Switch.nodes.Application.Container.Docker.VLAD_BEIAComponent":
artifacts:
beiacomponent_image:
type: "tosca.artifacts.Deployment.Image.Container.Docker"
repository: SWITCH_docker_hub
file: "beia/hang"
properties: properties:
waitingTime: Environment:
default: 5 type: string
type: integer derived_from: "Switch.nodes.Application.Container.Docker"
multicastAddrIP: "Switch.nodes.Application.Container.Docker.BEIA_RTUSensorDataManagement":
default: "225.2.2.0"
type: "Switch.datatypes.Network.Multicast"
switcherREST:
default: switcherREST
type: "Switch.datatypes.port"
switcherOutAddrPort:
default: 6000
type: "Switch.datatypes.port"
multicastAddrIP2:
default: "225.2.2.2"
type: "Switch.datatypes.Network.Multicast"
switcherOutAddrIP:
default: "226.2.2.2"
type: "Switch.datatypes.Network.Multicast"
multicastAddrPort:
default: 3000
type: "Switch.datatypes.port"
videoWidth:
default: 176
type: integer
multicastAddrPort2:
default: 3002
type: "Switch.datatypes.port"
videoHeight:
default: 100
type: integer
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.EventListener":
derived_from: "tosca.nodes.Root"
"Switch.nodes.MonitoringAgent": "Switch.nodes.MonitoringAgent":
properties: properties:
agent_id: agent_id:
...@@ -677,19 +415,106 @@ node_types: ...@@ -677,19 +415,106 @@ node_types:
type: "Switch.datatypes.monitoring.probe" type: "Switch.datatypes.monitoring.probe"
type: map type: map
derived_from: "tosca.nodes.Root" derived_from: "tosca.nodes.Root"
"Switch.nodes.Application.Container.Docker.BEIA_V1_TelemetryGateway":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.AdaptationPolicy": "Switch.nodes.AdaptationPolicy":
derived_from: "tosca.nodes.Root" derived_from: "tosca.nodes.Root"
"Switch.nodes.Application.Container.Docker.MonitoringServer": "Switch.nodes.Application.Container.Docker.VLAD_Alterter":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.VLAD_Graphite":
artifacts:
webui_image:
type: "tosca.artifacts.Deployment.Image.Container.Docker"
repository: SWITCH_docker_hub
file: "beia/nginx"
properties: properties:
ports_mapping: Environment:
entry_schema: entry_schema:
type: "Switch.datatypes.port_mapping" type: string
type: map type: map
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.MessagePasser": "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_Input":
properties:
port2:
default: 24
type: integer
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.VLAD_Alerter":
properties:
Environment:
entry_schema:
type: string
type: map
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_V1_Monitoring":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.PEDRO.SANTOS.MOG_Input_Distributor":
properties:
Input_RTP_TS_Port:
default: 2000
type: string
Waiting_Time:
default: 5
type: string
Output_Uncompressed_Video_Multicast_Address:
default: "225.2.2.0"
type: string
Output_Uncompressed_Video_Multicast_Port:
default: "3000 waiting time Waiting time (in seconds) for Input Distributor to receive TS stream 5 switcherOutAddrIP Multicast IP address where Video Switcher"
type: string
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Component":
derived_from: "tosca.nodes.Root" derived_from: "tosca.nodes.Root"
"Switch.nodes.Constraint":
requirements:
- monitor_server_endpoint:
node: "Switch.nodes.Application.Container.Docker.MonitoringServer"
capability: "tosca.capabilities.Node"
relationship: "tosca.relationships.DependsOn"
properties:
QoS:
type: "Switch.datatypes.QoS.AppComponent"
derived_from: "tosca.nodes.Root"
"Switch.nodes.Application.Container.Docker.PEDRO.SANTOS.MOG_Switcher":
properties:
Input_A_Uncompressed_Video_Multicast_Address:
default: "225.2.2.0"
type: string
Input_Video_Width:
default: 176
type: string
Input_B_Uncompressed_Video_Multicast_Port:
default: 3002
type: string
Input_B_Uncompressed_Video_Multicast_Address:
default: "225.2.2.1"
type: string
port:
default: 23
type: integer
Output_Uncompressed_Video_Multicast_Address:
default: "226.2.2.2"
type: string
Output_REST_PORT:
default: 8008
type: string
Output_Uncompressed_Video_Multicast_Port:
default: 6000
type: string
Input_Video_Height:
default: 100
type: string
Input_A_Uncompressed_Video_Multicast_Port:
default: 3000
type: string
Waiting_Time:
default: 5
type: string
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_V1_RTUSensorDataAcquisitions":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.VLAD_SIPNotifier":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_RTUSensorData":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_OutputTranscoder.Cardiff": "Switch.nodes.Application.Container.Docker.PEDRO.SANTOS_OutputTranscoder.Cardiff":
properties: properties:
OutIP: OutIP:
...@@ -705,6 +530,119 @@ node_types: ...@@ -705,6 +530,119 @@ node_types:
default: 100 default: 100
type: integer type: integer
derived_from: "Switch.nodes.Application.Container.Docker" derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.MOG_InputDistributor":
properties:
waitingTime:
default: 5
type: integer
multicastAddrIP:
default: "255.2.2.0"
type: string
multicastAddrPort:
default: 3000
type: integer
videoWidth:
default: 170
type: integer
inPort:
default: 2000
type: integer
videoHeight:
default: 100
type: integer
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Connection":
properties:
source:
type: "Switch.datatypes.Application.Connection.EndPoint"
bandwidth:
type: integer
multicast:
type: "Switch.datatypes.Network.Multicast"
jitter:
required: false
type: integer
target:
type: "Switch.datatypes.Application.Connection.EndPoint"
latency:
required: false
type: integer
QoS:
type: "Switch.datatypes.QoS.AppComponent"
derived_from: "tosca.nodes.Root"
"Switch.nodes.Requirement":
properties:
host:
type: "Switch.datatypes.hw.host"
os:
type: "Switch.datatypes.hw.os"
derived_from: "tosca.nodes.Root"
"Switch.nodes.ExternalComponent":
derived_from: "tosca.nodes.Root"
"Switch.nodes.DST":
properties:
dave:
type: string
derived_from: "tosca.nodes.Root"
"Switch.nodes.Application.Container.Docker.LOKSORR_Bb":
properties:
bb:
type: string
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_NotificationServer":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_V1_RTUSensorDataAcquisition":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.MonitoringServer":
properties:
ports_mapping:
entry_schema:
type: "Switch.datatypes.port_mapping"
type: map
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.UL_JitsiMeet_docker":
properties:
ips:
type: string
deploy:
type: string
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.LOKSORR_MatejsMagic":
artifacts:
matejsmagic_image:
type: "tosca.artifacts.Deployment.Image.Container.Docker"
repository: SWITCH_docker_hub
file: "matej/magic"
properties:
das:
default: das
required: false
type: string
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.VLAD_DataCollector":
artifacts:
data_collector_image:
type: "tosca.artifacts.Deployment.Image.Container.Docker"
repository: SWITCH_docker_hub
file: "beia/data_collector"
properties:
Environment:
entry_schema:
type: string
type: map
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.VLAD_BEIAGUI":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.VLAD_WebUI":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.BEIA_V1_TelemetryGateway":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.Application.Container.Docker.VLAD_Dashboard":
derived_from: "Switch.nodes.Application.Container.Docker"
"Switch.nodes.MessagePasser":
derived_from: "tosca.nodes.Root"
"Switch.nodes.Application.Container.Docker.BEIA_DB":
derived_from: "Switch.nodes.Application.Container.Docker"
repositories: repositories:
SWITCH_docker_hub: SWITCH_docker_hub:
url: "https://github.com/switch-project" url: "https://github.com/switch-project"
......
drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/Converter.java
View file @ 09fd2c95
...@@ -22,12 +22,9 @@ import java.io.InputStream; ...@@ -22,12 +22,9 @@ import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import nl.uva.sne.drip.drip.commons.data.v1.external.CloudCredentials; import nl.uva.sne.drip.drip.commons.data.v1.external.CloudCredentials;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
......
drip-deployer/docker_check.py
View file @ 09fd2c95
...@@ -117,7 +117,6 @@ def docker_check(vm, compose_name): ...@@ -117,7 +117,6 @@ def docker_check(vm, compose_name):
response_str+=line response_str+=line
json_dict = {} json_dict = {}
response_str = response_str.rstrip("\n\r").strip(' \t\n\r').strip().encode('string_escape') response_str = response_str.rstrip("\n\r").strip(' \t\n\r').strip().encode('string_escape')
print response_str
json_dict = json.loads(response_str) json_dict = json.loads(response_str)
json_response['nodes_info'] = json_dict json_response['nodes_info'] = json_dict
......
drip-deployer/rpc_server.py
View file @ 09fd2c95
...@@ -170,7 +170,7 @@ def on_request(ch, method, props, body): ...@@ -170,7 +170,7 @@ def on_request(ch, method, props, body):
response["parameters"].append(par) response["parameters"].append(par)
response = json.dumps(response) response = json.dumps(response)
#logger.info("Response: " + response) logger.info("Response: " + response)
ch.basic_publish(exchange='', ch.basic_publish(exchange='',
......
drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/P2PConverter.java
View file @ 09fd2c95
...@@ -29,8 +29,14 @@ public class P2PConverter { ...@@ -29,8 +29,14 @@ public class P2PConverter {
String provisionerScalingMode = "fixed"; String provisionerScalingMode = "fixed";
for (Object element : vmList) { for (Object element : vmList) {
Map<String, Object> map = (Map<String, Object>) element; Map<String, Object> map = null;
if (map.containsKey("scaling_mode")) { if (element instanceof Map) {
map = (Map<String, Object>) element;
} else if (element instanceof String) {
map = Converter.jsonString2Map((String) element);
}
if (map != null && map.containsKey("scaling_mode")) {
String scalingMode = (String) map.get("scaling_mode"); String scalingMode = (String) map.get("scaling_mode");
if (!scalingMode.equals("single")) { if (!scalingMode.equals("single")) {
provisionerScalingMode = "scaling"; provisionerScalingMode = "scaling";
...@@ -85,7 +91,13 @@ public class P2PConverter { ...@@ -85,7 +91,13 @@ public class P2PConverter {
boolean firstVM = true; boolean firstVM = true;
for (Object element : vmList) { for (Object element : vmList) {
Map<String, Object> map = (Map<String, Object>) element; Map<String, Object> map = null;
if (element instanceof Map) {
map = (Map<String, Object>) element;
} else if (element instanceof String) {
map = Converter.jsonString2Map((String) element);
}
VM curVM; VM curVM;
switch (cloudProvider.trim().toLowerCase()) { switch (cloudProvider.trim().toLowerCase()) {
case "ec2": case "ec2":
......
drip_planner2/src/rpc_server.py
View file @ 09fd2c95
...@@ -82,8 +82,8 @@ def handle_delivery(message): ...@@ -82,8 +82,8 @@ def handle_delivery(message):
if __name__ == "__main__": if __name__ == "__main__":
# home = expanduser("~") # home = expanduser("~")
# planner = DumpPlanner(home+"/workspace/DRIP/docs/input_tosca_files/MOG_cardif.yml") # planner = DumpPlanner(home+"/workspace/DRIP/docs/input_tosca_files/BEIA_cardif2.yml")
# planner.plan() # print planner.plan()
print sys.argv print sys.argv
channel = init_chanel(sys.argv) channel = init_chanel(sys.argv)
global queue_name global queue_name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment