Change the foreign link to ServiceInstance
Change-Id: I2a3bf870d5f795a60dff168bf084cc4730882a17
diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index 159b97e..da492a2 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# docker build -t xosproject/vepcservice-synchronizer:candidate -f Dockerfile.synchronizer .
+# docker build -t xosproject/k8sepcservice-synchronizer:candidate -f Dockerfile.synchronizer .
-# xosproject/vepcservice-synchronizer
+# xosproject/k8sepcservice-synchronizer
FROM xosproject/xos-synchronizer-base:2.0.0
diff --git a/xos/examples/VEpcServiceInstance.yaml b/xos/examples/VEpcServiceInstance.yaml
index a43bc70..a49c223 100644
--- a/xos/examples/VEpcServiceInstance.yaml
+++ b/xos/examples/VEpcServiceInstance.yaml
@@ -1,3 +1,4 @@
+
---
# Copyright 2017-present Open Networking Foundation
#
@@ -31,11 +32,11 @@
topology_template:
node_templates:
- service#vepcervice:
+ service#vepcservice:
type: tosca.nodes.VEpcService
properties:
name: vepcservice
- must-exist: true
+# must-exist: true
service#kubernetes:
type: tosca.nodes.KubernetesService
@@ -634,7 +635,7 @@
relationship: tosca.relationships.BelongsToOne
vepcresourceinstancelink_mme_statefulset:
- type: tosca.nodes.VEpcResourceInstanceLink
+ type: tosca.nodes.VEpcResourceInstanceLink
properties:
name: "MME StatefulSet Resource Link"
@@ -660,7 +661,7 @@
relationship: tosca.relationships.BelongsToOne
vepcresourceinstancelink_hss_statefulset:
- type: tosca.nodes.VEpcResourceInstanceLink
+ type: tosca.nodes.VEpcResourceInstanceLink
properties:
name: "HSS StatefulSet Resource Link"
@@ -686,7 +687,7 @@
relationship: tosca.relationships.BelongsToOne
vepcresourceinstancelink_hssdb_statefulset:
- type: tosca.nodes.VEpcResourceInstanceLink
+ type: tosca.nodes.VEpcResourceInstanceLink
properties:
name: "HSS Cassandra StatefulSet Resource Link"
@@ -712,7 +713,7 @@
relationship: tosca.relationships.BelongsToOne
vepcresourceinstancelink_spgwcu_statefulset:
- type: tosca.nodes.VEpcResourceInstanceLink
+ type: tosca.nodes.VEpcResourceInstanceLink
properties:
name: "HS SPGW Control and User StatefulSet Resource Link"
@@ -722,4 +723,4 @@
relationship: tosca.relationships.BelongsToOne
- vepc_service_instance:
node: vepcserviceinstance
- relationship: tosca.relationships.BelongsToOne
+ relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/xos/synchronizer/models/vepcservice.xproto b/xos/synchronizer/models/vepcservice.xproto
index 223ee0c..e8fd43c 100644
--- a/xos/synchronizer/models/vepcservice.xproto
+++ b/xos/synchronizer/models/vepcservice.xproto
@@ -11,6 +11,6 @@
message VEpcResourceInstanceLink(XOSBase) {
required string name = 1 [help_text = "Resource link name", db_index=True, tosca_key=True];
- required manytoone resource_instance->KubernetesResourceInstance:vepc_resource_instance_links = 2 [help_text = "Kubernetes resource file content", db_index=True, null=False, blank=False];
- required manytoone vepc_service_instance->VEpcServiceInstance:vepc_resource_instance_links = 3 [help_text = "Virtual EPC Service Instance", db_index=True, null=False, blank=False];
+ required manytoone resource_instance->ServiceInstance:vepc_resource_instance_links = 2 [help_text = "Kubernetes resource file content", db_index=True, null=False, blank=False];
+ required manytoone vepc_service_instance->VEpcServiceInstance:vepc_resource_instance_links2 = 3 [help_text = "Virtual EPC Service Instance", db_index=True, null=False, blank=False];
}
\ No newline at end of file