summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml3
-rw-r--r--common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml19
-rw-r--r--common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml6
-rw-r--r--sdc-os-chef/pom.xml2
-rwxr-xr-xsdc-os-chef/scripts/docker_run.sh24
-rw-r--r--sdc-os-chef/sdc-backend/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-cassandra/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-elasticsearch/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-frontend/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-kibana/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-sanity/Dockerfile2
-rw-r--r--utils/webseal-simulator/pom.xml2
-rw-r--r--utils/webseal-simulator/sdc-simulator/Dockerfile2
13 files changed, 47 insertions, 23 deletions
diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
index 285d6b28f3..9f0977868e 100644
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml
@@ -128,6 +128,9 @@ capability_types:
tosca.capabilities.nfv.Forwarder:
derived_from: tosca.capabilities.Root
+ org.openecomp.capabilities.Forwarder:
+ derived_from: tosca.capabilities.Root
+
tosca.capabilities.nfv.ext.Compute.Container.Architecture:
derived_from: tosca.capabilities.Root
properties:
diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
index 810bf304c1..8142c26bcd 100644
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
@@ -1342,4 +1342,21 @@ node_types:
required: false
type: list
connectivity_type:
- type: tosca.datatypes.nfv.ConnectivityType \ No newline at end of file
+ type: tosca.datatypes.nfv.ConnectivityType
+
+ org.openecomp.nodes.ForwardingPath:
+ derived_from: tosca.nodes.Root
+ properties:
+ target_range:
+ type: list
+ entry_schema:
+ description: Identifier of the reciever port of the VNF or the service
+ type: integer
+ protocol:
+ type: string
+ description: protocol type that runs on the link
+ requirements:
+ - forwarder:
+ capability: org.openecomp.capabilities.Forwarder
+ relationship: org.openecomp.relationships.ForwardsTo
+ occurrences: [ 0, UNBOUNDED ] \ No newline at end of file
diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
index 220658a8bf..5a43b79350 100644
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml
@@ -65,4 +65,8 @@ relationship_types:
derived_from: tosca.relationships.Root
tosca.relationships.nfv.VirtualLinksTo:
- derived_from: tosca.relationships.Root \ No newline at end of file
+ derived_from: tosca.relationships.Root
+
+ org.openecomp.relationships.ForwardsTo:
+ derived_from: tosca.relationships.Root
+ valid_target_types: [org.openecomp.capabilities.Forwarder] \ No newline at end of file
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 1630b31227..f0bf6ec9ff 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -303,7 +303,7 @@
<configuration>
<verbose>true</verbose>
<apiVersion>1.23</apiVersion>
- <registry>nexus3.onap.org:10003</registry>
+ <registry>nexus3.onap.org:10001</registry>
<authConfig>
<pull>
<username>docker</username>
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index 08be852676..b147c812aa 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -64,27 +64,27 @@ DEBUG_PORT="--publish 4000:4000"
[ -f /opt/config/nexus_password.txt ] && NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) || NEXUS_PASSWD=sfWU3DFVdBr7GVxB85mTYgAW
[ -f /opt/config/nexus_docker_repo.txt ] && NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) || NEXUS_DOCKER_REPO=ecomp-nexus:${PORT}
-while [ "$1" != "" ]; do
+while test $# -gt 0; do
case $1 in
-r | --release )
shift
- RELEASE=${1}
+ RELEASE=$1
;;
-e | --environment )
shift
- DEP_ENV=${1}
+ DEP_ENV=$1
;;
-p | --port )
shift
- PORT=${1}
+ PORT=$1
;;
- -l | --local )
- shift
- LOCAL=true
- ;;
- -s | --skipTests )
- shift
- SKIPTESTS=true
+ -l | --local )
+ shift
+ LOCAL=true
+ ;;
+ -s | --skipTests )
+ shift
+ SKIPTESTS=true
;;
-h | --help )
usage
@@ -94,9 +94,9 @@ while [ "$1" != "" ]; do
usage
exit 1
esac
- shift
done
+
[ -f /opt/config/nexus_username.txt ] && docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile
index e28a85d51e..ecd245a533 100644
--- a/sdc-os-chef/sdc-backend/Dockerfile
+++ b/sdc-os-chef/sdc-backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-backend:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-backend:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile
index 6066aeb453..27cbc92214 100644
--- a/sdc-os-chef/sdc-cassandra/Dockerfile
+++ b/sdc-os-chef/sdc-cassandra/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-cassandra:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-cassandra:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/sdc-os-chef/sdc-elasticsearch/Dockerfile b/sdc-os-chef/sdc-elasticsearch/Dockerfile
index 60db8e5b6b..4f1463dd82 100644
--- a/sdc-os-chef/sdc-elasticsearch/Dockerfile
+++ b/sdc-os-chef/sdc-elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-elasticsearch:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-elasticsearch:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/sdc-os-chef/sdc-frontend/Dockerfile b/sdc-os-chef/sdc-frontend/Dockerfile
index 5039b08034..2940a43286 100644
--- a/sdc-os-chef/sdc-frontend/Dockerfile
+++ b/sdc-os-chef/sdc-frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-frontend:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-frontend:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/sdc-os-chef/sdc-kibana/Dockerfile b/sdc-os-chef/sdc-kibana/Dockerfile
index 6a058def0e..ccaa350ca4 100644
--- a/sdc-os-chef/sdc-kibana/Dockerfile
+++ b/sdc-os-chef/sdc-kibana/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-kibana:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-kibana:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/sdc-os-chef/sdc-sanity/Dockerfile b/sdc-os-chef/sdc-sanity/Dockerfile
index 38bf26641e..1dd064a585 100644
--- a/sdc-os-chef/sdc-sanity/Dockerfile
+++ b/sdc-os-chef/sdc-sanity/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-sanity:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-sanity:v1.0.0
COPY chef-solo /root/chef-solo/
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index fb60abd82a..e240da6d01 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -208,7 +208,7 @@
<configuration>
<verbose>true</verbose>
<apiVersion>1.23</apiVersion>
- <registry>nexus3.onap.org:10003</registry>
+ <registry>nexus3.onap.org:10001</registry>
<authConfig>
<pull>
<username>docker</username>
diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile
index e1a415f2ce..99fad58fe8 100644
--- a/utils/webseal-simulator/sdc-simulator/Dockerfile
+++ b/utils/webseal-simulator/sdc-simulator/Dockerfile
@@ -1,4 +1,4 @@
-FROM openecomp/base_sdc-frontend:1.0.0-SNAPSHOT-latest
+FROM openecomp/base_sdc-frontend:v1.0.0
COPY chef-solo /root/chef-solo/