You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2020/09/24 12:10:46 UTC

[incubator-streampipes] branch STREAMPIPES-234 updated (3000e99 -> d3fde33)

This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a change to branch STREAMPIPES-234
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.


    from 3000e99  [STREAMPIPES-234] Labeled time intervals can now be changed
     add 3e79366  [hotfix] add run config for all-pipeline-elements-flink
     add 797411f  [hotfix] update pipeline element section
     add 20b4e09  [STREAMPIPES-235] Add html font format only option as freetext static property
     add 95340c8  [hotfix] Show error if runtime info is not available
     add 53c3d7c  [hotfix] Fix placeholder in free text static property renderer
     add 94ef078  [hotfix] Add radio group around oneof static property renderer
     add 4711b9b  [hotfix] Remove license texts of licenses that are not mentioned in LICENSE
     add 3402027  Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
     add fff1f84  [hotfix] add timestamp as header
     add af1cd97  Remove unused dashboard widget
     add 32e71e0  Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
     add 0c9a551  [STREAMPIPES-145] Add update emitter to mapping properties
     add 637fc7a  [hotfix] Fix TransformOutput generators
     add 6ab56c5  Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
     add 4f3db5d  [STREAMPIPES-217] Harmonize file management for pipeline elements and adapters
     add 86f3f1c  [STREAMPIPES-217] Add additional file extensions to SDK
     add b6586c9  [STREAMPIPES-217] Add delete feature to file management
     add 54d29f2  [STREAMPIPES-217] Remove obsolete file resources and views
     add 93b7df1  [hotfix] Fix bug that caused pipeline element recommender to crash
     add 6ee742d  [hotfix] Improve loading of remote static properties
     add f545b26  [STREAMPIPES-242] Mqtt adapter next button can not be clicked
     add 722dc11  Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
     add 70309e0  Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
     add 6ec413b  [STREAMPIPES-217] Improve file upload behaviour
     add 535cf08  [hotfix] Make pipeline table sortable
     add e3b82fe  [hotfix] Fix bug that prevented historical notifications from loading
     add 6543820  Fix CSV export for missing columns in database
     add 1973024  Add grouping to maps dashboard widget
     add 161d5b0  Fix table of content link
     new b27be36  [STREAMPIPES-243] Configuration of And Processor is broken
     new 7a82857  [STREAMPIPES-231] Images are not shown in Data Explorer
     new d3fde33  Merge branch 'dev' into STREAMPIPES-234

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ...s_flink.xml => all_pipeline_elements_flink.xml} |   8 +-
 README.md                                          |  16 +--
 docker-compose.yml                                 |  21 ++++
 licenses/BSD_2-Clause                              |  14 ---
 licenses/CDDL_1.0                                  |  83 ---------------
 licenses/CDDL_1.1                                  |  88 ----------------
 licenses/CDDL_LICENSE_1.1                          |  90 ----------------
 licenses/EPL_1.0                                   |  83 ---------------
 licenses/EPL_2.0                                   |  81 ---------------
 licenses/Eclipse_Distribution_License_v1.0         |  11 --
 .../init/AdapterMasterContainerResourceConfig.java |  14 +--
 .../master/management/FileManagement.java          |  79 --------------
 .../container/master/rest/FileResource.java        | 114 ---------------------
 .../init/AdapterWorkerContainerResourceConfig.java |  11 +-
 .../worker/management/FileManagement.java          |  89 ----------------
 .../container/worker/rest/FileResource.java        | 104 -------------------
 .../container/api/InvocableElement.java            |  34 +++---
 .../model/client/file/FileMetadata.java            |   2 +
 .../model/staticproperty/FileStaticProperty.java   |  16 +++
 .../staticproperty/FreeTextStaticProperty.java     |  12 +++
 .../streampipes/manager/file/FileManager.java      |   3 +-
 .../manager/matching/ConnectionValidator.java      |   4 +-
 .../manager/matching/InvocationGraphBuilder.java   |   3 +-
 .../matching/PipelineVerificationHandler.java      |  18 +++-
 .../CustomTransformOutputSchemaGenerator.java      |  12 +--
 .../output/TransformOutputSchemaGenerator.java     |  43 +++-----
 .../manager/recommender/ElementRecommender.java    |  20 ++--
 .../streampipes/rest/api/IPipelineElementFile.java |   7 +-
 .../rest/impl/AbstractRestInterface.java           |   7 ++
 .../streampipes/rest/impl/PipelineElementFile.java |  42 +++++---
 .../rest/impl/PipelineWithUserResource.java        |  12 +--
 .../rest/impl/datalake/DataLakeManagementV3.java   |   8 +-
 .../apache/streampipes/sdk/StaticProperties.java   |  16 +++
 ...AbstractConfigurablePipelineElementBuilder.java |  60 +++++++++++
 .../sdk/extractor/AbstractParameterExtractor.java  |  26 +++--
 .../sdk/extractor/StaticPropertyExtractor.java     |   5 +
 .../{StreamIdentifier.java => Filetypes.java}      |  28 ++---
 .../apache/streampipes/vocabulary/StreamPipes.java |   3 +
 ui/deployment/dev/config.yml                       |   1 +
 ui/deployment/modules.yml                          |  17 ++-
 ui/src/app/app-routing.module.ts                   |   2 +
 .../data-marketplace.component.html                |   9 +-
 .../file-management/file-management.component.css  |  18 ----
 .../file-management/file-management.component.html |  43 --------
 .../file-management/file-management.component.ts   |  94 -----------------
 .../pipeline-element-runtime-info.component.html   |   5 +-
 .../pipeline-element-runtime-info.component.ts     |  24 +++--
 .../event-schema/event-schema.component.ts         |   1 +
 ui/src/app/connect/connect.module.ts               |   8 --
 ui/src/app/connect/services/filerest.service.ts    |  74 -------------
 .../app/core-model/gen/streampipes-model-client.ts |  29 +++++-
 ui/src/app/core-model/gen/streampipes-model.ts     |  12 ++-
 ui/src/app/core-ui/core-ui.module.ts               |   2 +
 .../confirm-dialog/confirm-dialog.component.html   |   2 +-
 .../confirm-dialog/confirm-dialog.component.ts     |   4 +
 .../base/abstract-static-property.ts               |   4 +
 .../static-collection.component.ts                 |   5 -
 .../static-file-input.component.css                |   4 -
 .../static-file-input.component.html               |  49 ++++++---
 .../static-file-input.component.ts                 |  54 ++++++++--
 .../static-free-input.component.html               |   3 +-
 .../static-free-input.component.ts                 |  14 ++-
 .../static-mapping-nary.component.ts               |   1 +
 .../static-mapping-unary.component.ts              |   9 +-
 .../static-mapping/static-mapping.ts               |   1 +
 .../static-one-of-input.component.css              |   6 ++
 .../static-one-of-input.component.html             |  14 +--
 .../static-property.component.html                 |  10 +-
 .../static-secret-input.component.html             |   2 +-
 .../core/components/base-navigation.component.ts   |   5 +
 .../dashboard/components/widgets/map/map-config.ts |  48 +++++----
 .../widgets/map/map-widget.component.html          |   3 +-
 .../components/widgets/map/map-widget.component.ts |  75 +++++++++++---
 .../components/widgets/pallet/pallet-config.ts     |  43 --------
 .../components/widgets/pallet/pallet.component.css |  16 ---
 .../widgets/pallet/pallet.component.html           |  18 ----
 .../components/widgets/pallet/pallet.component.ts  |  78 --------------
 .../components/widgets/pallet/pallet_functions.ts  |  82 ---------------
 ui/src/app/dashboard/dashboard.module.ts           |  78 +++++++-------
 ui/src/app/dashboard/registry/widget-registry.ts   |   6 +-
 .../custom-output-strategy.component.html          |   2 +-
 .../pipeline-element-options.component.html        |  91 ++++++++--------
 .../pipeline-element-options.component.ts          |  21 ++--
 .../pipeline-element-recommendation.component.html |   4 +-
 .../pipeline-element-recommendation.component.ts   |  35 +++----
 .../components/pipeline/pipeline.component.ts      |  43 +++++---
 .../file-overview/file-overview.component.html     |  60 +++++++++++
 .../file-overview/file-overview.component.scss}    |   8 +-
 .../file-overview/file-overview.component.ts       |  82 +++++++++++++++
 .../file-upload/file-upload-dialog.component.html  |  53 ++++++++++
 .../file-upload/file-upload-dialog.component.scss} |   0
 .../file-upload/file-upload-dialog.component.ts    |  76 ++++++++++++++
 .../files.component.html}                          |  40 ++++----
 .../files.component.scss}                          |  19 ++--
 .../files.component.ts}                            |  31 ++++--
 .../login.module.ts => files/files.module.ts}      |  74 ++++++-------
 .../app/notifications/notifications.component.ts   |   8 +-
 .../app/notifications/utils/notifications.utils.ts |   2 +-
 .../pipeline-overview.component.html               |   8 +-
 .../pipeline-overview.component.ts                 |   6 +-
 ui/src/app/pipelines/pipelines.module.ts           |   6 +-
 ui/src/app/platform-services/apis/files.service.ts |  63 ++++++++++++
 ui/src/app/platform-services/platform.module.ts    |   2 +
 103 files changed, 1208 insertions(+), 1786 deletions(-)
 copy .idea/runConfigurations/{processors_statistics_flink.xml => all_pipeline_elements_flink.xml} (65%)
 delete mode 100644 licenses/BSD_2-Clause
 delete mode 100644 licenses/CDDL_1.0
 delete mode 100644 licenses/CDDL_1.1
 delete mode 100644 licenses/CDDL_LICENSE_1.1
 delete mode 100644 licenses/EPL_1.0
 delete mode 100644 licenses/EPL_2.0
 delete mode 100644 licenses/Eclipse_Distribution_License_v1.0
 delete mode 100644 streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/FileManagement.java
 delete mode 100644 streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/rest/FileResource.java
 delete mode 100644 streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/management/FileManagement.java
 delete mode 100644 streampipes-connect-container-worker/src/main/java/org/apache/streampipes/connect/container/worker/rest/FileResource.java
 copy streampipes-sdk/src/main/java/org/apache/streampipes/sdk/helpers/{StreamIdentifier.java => Filetypes.java} (68%)
 delete mode 100644 ui/src/app/connect/components/file-management/file-management.component.css
 delete mode 100644 ui/src/app/connect/components/file-management/file-management.component.html
 delete mode 100644 ui/src/app/connect/components/file-management/file-management.component.ts
 delete mode 100644 ui/src/app/connect/services/filerest.service.ts
 delete mode 100644 ui/src/app/dashboard/components/widgets/pallet/pallet-config.ts
 delete mode 100644 ui/src/app/dashboard/components/widgets/pallet/pallet.component.css
 delete mode 100644 ui/src/app/dashboard/components/widgets/pallet/pallet.component.html
 delete mode 100644 ui/src/app/dashboard/components/widgets/pallet/pallet.component.ts
 delete mode 100644 ui/src/app/dashboard/components/widgets/pallet/pallet_functions.ts
 create mode 100644 ui/src/app/files/components/file-overview/file-overview.component.html
 copy ui/src/app/{pipelines/components/pipeline-overview/pipeline-overview.component.scss => files/components/file-overview/file-overview.component.scss} (90%)
 create mode 100644 ui/src/app/files/components/file-overview/file-overview.component.ts
 create mode 100644 ui/src/app/files/dialog/file-upload/file-upload-dialog.component.html
 copy ui/src/app/{connect/dialog/adapter-started/adapter-started-dialog.component.scss => files/dialog/file-upload/file-upload-dialog.component.scss} (100%)
 create mode 100644 ui/src/app/files/dialog/file-upload/file-upload-dialog.component.ts
 copy ui/src/app/{dashboard/dashboard.component.html => files/files.component.html} (54%)
 copy ui/src/app/{add/add.component.scss => files/files.component.scss} (92%)
 copy ui/src/app/{core-ui/dialog/standard-dialog/standard-dialog.component.ts => files/files.component.ts} (50%)
 copy ui/src/app/{login/login.module.ts => files/files.module.ts} (52%)
 create mode 100644 ui/src/app/platform-services/apis/files.service.ts


[incubator-streampipes] 01/03: [STREAMPIPES-243] Configuration of And Processor is broken

Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a commit to branch STREAMPIPES-234
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit b27be3640fcba6a02267d12a3284e8f205597d5b
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Sep 23 13:19:59 2020 +0200

    [STREAMPIPES-243] Configuration of And Processor is broken
---
 .../output-strategy/custom-output/custom-output-strategy.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/editor/components/output-strategy/custom-output/custom-output-strategy.component.html b/ui/src/app/editor/components/output-strategy/custom-output/custom-output-strategy.component.html
index 2efa74e..9d169bc 100644
--- a/ui/src/app/editor/components/output-strategy/custom-output/custom-output-strategy.component.html
+++ b/ui/src/app/editor/components/output-strategy/custom-output/custom-output-strategy.component.html
@@ -31,7 +31,7 @@
         <property-selection (validateForm)="checkFormValidity()" [outputStrategy]="outputStrategy" [eventProperty]="property"
                             [layer]="0" [restrictedEditMode]="restrictedEditMode"></property-selection>
     </div>
-    <div *ngIf="collectedPropertiesSecondStream.length > 0">
+    <div fxLayout="column" fxFlex="100" *ngIf="collectedPropertiesSecondStream.length > 0">
         <div fxFlex="100" fxLayout="row" fxLayoutAlign="start center">
             <h5 style="margin-right:10px;">{{selectedElement.inputStreams[1].name}}</h5>
             <button mat-button mat-raised-button color="primary" class="small-button"


[incubator-streampipes] 03/03: Merge branch 'dev' into STREAMPIPES-234

Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a commit to branch STREAMPIPES-234
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit d3fde33d489b862b778031fe0eaed249dff68b3a
Merge: 3000e99 7a82857
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Thu Sep 24 14:10:31 2020 +0200

    Merge branch 'dev' into STREAMPIPES-234

 .../all_pipeline_elements_flink.xml                |  15 +++
 README.md                                          |  16 +--
 docker-compose.yml                                 |  21 ++++
 licenses/BSD_2-Clause                              |  14 ---
 licenses/CDDL_1.0                                  |  83 ---------------
 licenses/CDDL_1.1                                  |  88 ----------------
 licenses/CDDL_LICENSE_1.1                          |  90 ----------------
 licenses/EPL_1.0                                   |  83 ---------------
 licenses/EPL_2.0                                   |  81 ---------------
 licenses/Eclipse_Distribution_License_v1.0         |  11 --
 .../init/AdapterMasterContainerResourceConfig.java |  14 +--
 .../master/management/FileManagement.java          |  79 --------------
 .../container/master/rest/FileResource.java        | 114 ---------------------
 .../init/AdapterWorkerContainerResourceConfig.java |  11 +-
 .../worker/management/FileManagement.java          |  89 ----------------
 .../container/worker/rest/FileResource.java        | 104 -------------------
 .../container/api/InvocableElement.java            |  34 +++---
 .../model/client/file/FileMetadata.java            |   2 +
 .../model/staticproperty/FileStaticProperty.java   |  16 +++
 .../staticproperty/FreeTextStaticProperty.java     |  12 +++
 .../streampipes/manager/file/FileManager.java      |   3 +-
 .../manager/matching/ConnectionValidator.java      |   4 +-
 .../manager/matching/InvocationGraphBuilder.java   |   3 +-
 .../matching/PipelineVerificationHandler.java      |  18 +++-
 .../CustomTransformOutputSchemaGenerator.java      |  12 +--
 .../output/TransformOutputSchemaGenerator.java     |  43 +++-----
 .../manager/recommender/ElementRecommender.java    |  20 ++--
 .../streampipes/rest/api/IPipelineElementFile.java |   7 +-
 .../rest/impl/AbstractRestInterface.java           |   7 ++
 .../streampipes/rest/impl/PipelineElementFile.java |  42 +++++---
 .../rest/impl/PipelineWithUserResource.java        |  12 +--
 .../rest/impl/datalake/DataLakeManagementV3.java   |   8 +-
 .../apache/streampipes/sdk/StaticProperties.java   |  16 +++
 ...AbstractConfigurablePipelineElementBuilder.java |  60 +++++++++++
 .../sdk/extractor/AbstractParameterExtractor.java  |  26 +++--
 .../sdk/extractor/StaticPropertyExtractor.java     |   5 +
 .../apache/streampipes/sdk/helpers/Filetypes.java  |  26 +++--
 .../apache/streampipes/vocabulary/StreamPipes.java |   3 +
 ui/deployment/dev/config.yml                       |   1 +
 ui/deployment/modules.yml                          |  17 ++-
 ui/src/app/app-routing.module.ts                   |   2 +
 .../data-marketplace.component.html                |   9 +-
 .../file-management/file-management.component.html |  43 --------
 .../file-management/file-management.component.ts   |  94 -----------------
 .../pipeline-element-runtime-info.component.html   |   5 +-
 .../pipeline-element-runtime-info.component.ts     |  24 +++--
 .../event-schema/event-schema.component.ts         |   1 +
 ui/src/app/connect/connect.module.ts               |   8 --
 ui/src/app/connect/services/filerest.service.ts    |  74 -------------
 .../app/core-model/gen/streampipes-model-client.ts |  29 +++++-
 ui/src/app/core-model/gen/streampipes-model.ts     |  12 ++-
 ui/src/app/core-ui/core-ui.module.ts               |   2 +
 .../confirm-dialog/confirm-dialog.component.html   |   2 +-
 .../confirm-dialog/confirm-dialog.component.ts     |   4 +
 .../base/abstract-static-property.ts               |   4 +
 .../static-collection.component.ts                 |   5 -
 .../static-file-input.component.css                |   4 -
 .../static-file-input.component.html               |  49 ++++++---
 .../static-file-input.component.ts                 |  54 ++++++++--
 .../static-free-input.component.html               |   3 +-
 .../static-free-input.component.ts                 |  14 ++-
 .../static-mapping-nary.component.ts               |   1 +
 .../static-mapping-unary.component.ts              |   9 +-
 .../static-mapping/static-mapping.ts               |   1 +
 .../static-one-of-input.component.css              |   6 ++
 .../static-one-of-input.component.html             |  14 +--
 .../static-property.component.html                 |  10 +-
 .../static-secret-input.component.html             |   2 +-
 .../core/components/base-navigation.component.ts   |   5 +
 .../dashboard/components/widgets/map/map-config.ts |  48 +++++----
 .../widgets/map/map-widget.component.html          |   3 +-
 .../components/widgets/map/map-widget.component.ts |  75 +++++++++++---
 .../components/widgets/pallet/pallet-config.ts     |  43 --------
 .../components/widgets/pallet/pallet.component.css |  16 ---
 .../widgets/pallet/pallet.component.html           |  18 ----
 .../components/widgets/pallet/pallet.component.ts  |  78 --------------
 .../components/widgets/pallet/pallet_functions.ts  |  82 ---------------
 ui/src/app/dashboard/dashboard.module.ts           |  78 +++++++-------
 ui/src/app/dashboard/registry/widget-registry.ts   |   6 +-
 .../custom-output-strategy.component.html          |   2 +-
 .../pipeline-element-options.component.html        |  91 ++++++++--------
 .../pipeline-element-options.component.ts          |  21 ++--
 .../pipeline-element-recommendation.component.html |   4 +-
 .../pipeline-element-recommendation.component.ts   |  35 +++----
 .../components/pipeline/pipeline.component.ts      |  43 +++++---
 .../file-overview/file-overview.component.html     |  60 +++++++++++
 .../file-overview/file-overview.component.scss}    |  30 +++---
 .../file-overview/file-overview.component.ts       |  82 +++++++++++++++
 .../file-upload/file-upload-dialog.component.html  |  53 ++++++++++
 .../file-upload/file-upload-dialog.component.scss} |   1 +
 .../file-upload/file-upload-dialog.component.ts    |  76 ++++++++++++++
 ui/src/app/files/files.component.html              |  53 ++++++++++
 .../files.component.scss}                          |  27 ++---
 ui/src/app/files/files.component.ts                |  50 +++++++++
 ui/src/app/files/files.module.ts                   |  77 ++++++++++++++
 .../app/notifications/notifications.component.ts   |   8 +-
 .../app/notifications/utils/notifications.utils.ts |   2 +-
 .../pipeline-overview.component.html               |   8 +-
 .../pipeline-overview.component.ts                 |   6 +-
 ui/src/app/pipelines/pipelines.module.ts           |   6 +-
 ui/src/app/platform-services/apis/files.service.ts |  63 ++++++++++++
 ui/src/app/platform-services/platform.module.ts    |   2 +
 102 files changed, 1336 insertions(+), 1711 deletions(-)



[incubator-streampipes] 02/03: [STREAMPIPES-231] Images are not shown in Data Explorer

Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zehnder pushed a commit to branch STREAMPIPES-234
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 7a82857ea013627f69faa0e4cccca0f1e8bb38d8
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Wed Sep 23 21:43:02 2020 +0200

    [STREAMPIPES-231] Images are not shown in Data Explorer
---
 docker-compose.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 72808d2..af10fbf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,6 +44,9 @@ services:
     depends_on:
       - consul
       - couchdb
+    volumes:
+      - backend:/root/.streampipes
+      - files:/spImages
     logging: *default-logging
     networks:
       spnet:
@@ -110,6 +113,8 @@ services:
       - -enable-script-checks=true
       - -ui
     logging: *default-logging
+    volumes:
+      - consul:/consul/data
     networks:
       spnet:
         ipv4_address: 172.31.0.9
@@ -117,6 +122,8 @@ services:
   couchdb:
     image: fogsyio/couchdb:2.3.1
     logging: *default-logging
+    volumes:
+      - couchdb:/opt/couchdb/data
     networks:
       spnet:
 
@@ -134,6 +141,7 @@ services:
       KAFKA_ADVERTISED_HOST_NAME: kafka
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
     volumes:
+      - kafka:/kafka
       - /var/run/docker.sock:/var/run/docker.sock
     logging: *default-logging
     networks:
@@ -142,6 +150,8 @@ services:
   zookeeper:
     image: fogsyio/zookeeper:3.4.13
     logging: *default-logging
+    volumes:
+      - zookeeper:/opt/zookeeper-3.4.13
     networks:
       spnet:
 
@@ -151,10 +161,21 @@ services:
       - INFLUXDB_DATA_ENGINE=tsm1
       - INFLUXDB_REPORTING_DISABLED=false
       - INFLUXDB_ADMIN_ENABLED=true
+    volumes:
+      - influxdb:/var/lib/influxdb
     logging: *default-logging
     networks:
       spnet:
 
+volumes:
+  kafka:
+  files:
+  consul:
+  couchdb:
+  zookeeper:
+  influxdb:
+  backend:
+
 networks:
   spnet:
     name: spnet