Merge "Merge from ECOMP's repository"

26 files changed, 59 insertions, 350 deletions

diff --git a/vid-app-common/src/main/resources/1712_ADIOD.zip b/vid-app-common/src/main/resources/1712_ADIOD.zip
index 281ee8aa3..de8fa7eb4 100644
--- a/vid-app-common/src/main/resources/1712_ADIOD.zip
+++ b/vid-app-common/src/main/resources/1712_ADIOD.zip
diff --git a/vid-app-common/src/main/resources/2f80c596.zip b/vid-app-common/src/main/resources/2f80c596.zip
index 0babeeb24..95161faac 100644
--- a/vid-app-common/src/main/resources/2f80c596.zip
+++ b/vid-app-common/src/main/resources/2f80c596.zip
diff --git a/vid-app-common/src/main/resources/adiod.zip b/vid-app-common/src/main/resources/adiod.zip
index 6c928a354..6e024234a 100644
--- a/vid-app-common/src/main/resources/adiod.zip
+++ b/vid-app-common/src/main/resources/adiod.zip
diff --git a/vid-app-common/src/main/resources/cacheConfig.json b/vid-app-common/src/main/resources/cacheConfig.json
new file mode 100644
index 000000000..01836bd65
--- /dev/null
+++ b/vid-app-common/src/main/resources/cacheConfig.json
@@ -0,0 +1,17 @@
+{
+  "getTenants" : {
+    "isActive": true,
+    "expireAfterWriteHours": 24,
+    "refreshAfterWriteSeconds": 300
+  },
+  "getServiceModelsByDistributionStatus" : {
+    "isActive": true,
+    "expireAfterWriteHours": 24,
+    "refreshAfterWriteSeconds": 300
+  },
+  "getAllSubscribers" : {
+    "isActive": true,
+    "expireAfterWriteHours": 24,
+    "refreshAfterWriteSeconds": 300
+  }
+}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/csar317927061915233480.zip b/vid-app-common/src/main/resources/csar317927061915233480.zip
index ce58b17dc..ad959896e 100644
--- a/vid-app-common/src/main/resources/csar317927061915233480.zip
+++ b/vid-app-common/src/main/resources/csar317927061915233480.zip
diff --git a/vid-app-common/src/main/resources/csar3933948645405128424.zip b/vid-app-common/src/main/resources/csar3933948645405128424.zip
index ee9b4fb0c..13c65168a 100644
--- a/vid-app-common/src/main/resources/csar3933948645405128424.zip
+++ b/vid-app-common/src/main/resources/csar3933948645405128424.zip
diff --git a/vid-app-common/src/main/resources/json/mso/cloudConfiguration b/vid-app-common/src/main/resources/json/mso/cloudConfiguration
deleted file mode 100755
index eb627798f..000000000
--- a/vid-app-common/src/main/resources/json/mso/cloudConfiguration
+++ /dev/null
@@ -1,19 +0,0 @@
-{

-    "$schema": "http://json-schema.org/draft-04/schema#",

-	"description": "fields communicating the cloud configuration in a standard way",

-	"type": "object",

-	"properties": {  

-		"nodeLocation": {

-			"description": "Location identifier for the node",

-			"type": "string"

-		},  

-		"lcpCloudRegionId": {

-			"description": "LCP Node Location identifier",

-			"type": "string"

-		},  

-		"tenantId": {

-			"description": "Openstack tenant id",

-			"type": "string"

-		}  

-	}

-}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/instanceIds b/vid-app-common/src/main/resources/json/mso/instanceIds
deleted file mode 100755
index c20ea9ad1..000000000
--- a/vid-app-common/src/main/resources/json/mso/instanceIds
+++ /dev/null
@@ -1,29 +0,0 @@
-{

-    "$schema": "http://json-schema.org/draft-04/schema#",

-			"description": "instanceIds that may be associated with a particular request",

-			"type": "object",

-			"properties": {  

-				"networkInstanceId": {

-					"description": "UUID for the network instance (if any)",

-					"type": "string"

-				},  

-				"serviceInstanceId": {

-					"description": "UUID for the service instance",

-					"type": "string"

-				},  

-				"vfModuleInstanceId": {

-					"description": "UUID for the vfModule instance (if any)",

-					"type": "string"

-				},  

-				"vnfInstanceId": {

-					"description": "UUID for the vnf instance (if any)",

-					"type": "string"

-				},  

-				"volumeGroupInstanceId": {

-					"description": "UUID for the volume group instance (if any)",

-					"type": "string"

-				}  

-		}

-}

-

-			
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/modelInfo b/vid-app-common/src/main/resources/json/mso/modelInfo
deleted file mode 100755
index 56d268ce9..000000000
--- a/vid-app-common/src/main/resources/json/mso/modelInfo
+++ /dev/null
@@ -1,42 +0,0 @@
-{

-	"$schema": "http://json-schema.org/draft-04/schema#",

-	"description": "fields describing the SDC entity being operated on by the request",

-	"type": "object",

-	"properties": {

-		"modelCustomizationName": {

-			"description": "reference to the customized set of parameters associated with a model in a given service context",

-			"type": "string"

-		},

-		"modelCustomizationId": {

-			"description": "reference to the customized set of parameters associated with a model in a given service context",

-			"type": "string"

-		},

-		"modelInvariantId": {

-			"description": "Invariant UUID for the model name, irrespective of the version, as defined in SDC--authoritative",

-			"type": "string",

-			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"

-		},

-        "modelVersionId": {

-                "description": "Version id for version",

-                "type": "string"

-            },

-		"modelName": {

-			"description": "name of the model as defined in SDC--not authoritative",

-			"type": "string"

-		},

-		"modelNameVersionId": {

-			"description": "UUID for the model name and version combination as defined in SDC--authoritative",

-			"type": "string",

-			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"

-		},

-		"modelType": {

-			"description": "short description of the entity being operated on",

-			"type": "string"

-		},

-		"modelVersion": {

-			"description": "the version of the model as defined in SDC--not authoritative",

-			"type": "string"

-		}

-	},

-	"required": ["modelType"]

-}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/relatedInstance b/vid-app-common/src/main/resources/json/mso/relatedInstance
deleted file mode 100755
index 89554a54c..000000000
--- a/vid-app-common/src/main/resources/json/mso/relatedInstance
+++ /dev/null
@@ -1,16 +0,0 @@
-{

-	"description": "modelInfo and optional instanceId and instanceName for a model related to the modelInfo being operated on",

-	"type": "object",

-	"properties": {

-		"instanceName": {

-			"description": "optional name for the instance Id of the related model",

-			"type": "string"

-		},

-		"instanceId": {

-			"description": "instance Id for the related model",

-			"type": "string"

-		},

-		"modelInfo": {}

-	},

-	"required": ["modelInfo"]

-}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/relatedModel b/vid-app-common/src/main/resources/json/mso/relatedModel
deleted file mode 100755
index a70a17183..000000000
--- a/vid-app-common/src/main/resources/json/mso/relatedModel
+++ /dev/null
@@ -1,15 +0,0 @@
-{

-	"$schema": "http://json-schema.org/draft-04/schema#",

-	"description": "modelInfo and optional instance id for a model related to the modelInfo being operated on",

-	"type": "object",

-	"properties": {			

-		"instanceId": {

-			"description": "instance Id for the related model",

-			"type": "string"

-		},

-		"modelInfo": {}

-	},

-	"required": [ "modelInfo" ]

-}

-

-

diff --git a/vid-app-common/src/main/resources/json/mso/request b/vid-app-common/src/main/resources/json/mso/request
deleted file mode 100755
index 61f10400e..000000000
--- a/vid-app-common/src/main/resources/json/mso/request
+++ /dev/null
@@ -1,32 +0,0 @@
-{

-	"$schema": "http://json-schema.org/draft-04/schema#",

-	"description": "request structure",

-	"type": "object",

-	"properties": {

-		"finishTime": {

-			"description": "Date and time the request was finished in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",

-			"type": "string"

-		},

-		"instanceIds": {},

-		"requestDetails": {},

-		"requestId": {

-			"description": "UUID for the request generated by the instantiation service",

-			"type": "string",

-			"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"

-		},

-		"requestScope": {

-			"description": "short description of the entity being operated on",

-			"type": "string"

-		},

-		"requestStatus": {},

-		"requestType": {

-			"description": "short description of the action being performed on the requestScope",

-			"type": "string"

-		},

-		"startTime": {

-			"description": "Date and time the request was created in GMT with the following sample format: Wed, 15 Oct 2014 13:01:52 GMT",

-			"type": "string"

-		}

-	},

-	"required": ["requestDetails", "requestId", "requestScope", "requestType", "startTime"]

-}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/requestDetails b/vid-app-common/src/main/resources/json/mso/requestDetails
deleted file mode 100755
index c0ef53044..000000000
--- a/vid-app-common/src/main/resources/json/mso/requestDetails
+++ /dev/null
@@ -1,13 +0,0 @@
-{

-    "description": "aggregates the context, configuraiton and detailed parameters associated with the request into a single structure",

-    "properties": {

-        "cloudConfiguration": {},

-        "modelInfo": {},

-        "relatedModelList": {},

-        "requestInfo": {},

-        "requestParameters": {},

-        "subscriberInfo": {}

-    },

-    "type": "object"

-}

-

diff --git a/vid-app-common/src/main/resources/json/mso/requestError b/vid-app-common/src/main/resources/json/mso/requestError
deleted file mode 100755
index 497f67192..000000000
--- a/vid-app-common/src/main/resources/json/mso/requestError
+++ /dev/null
@@ -1,27 +0,0 @@
-{

-    "$schema": "http://json-schema.org/draft-04/schema#",

-    "description": "standard request error data structure",

-    "properties": {

-        "messageId": {

-            "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",

-            "type": "string"

-        },

-        "text": {

-            "description": "Message text, with replacement variables marked with %n, where n is an index into the list of <variables> elements, starting at 1",

-            "type": "string"

-        },

-        "url": {

-            "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",

-            "type": "string"

-        },

-        "variables": {

-            "description": "List of zero or more strings that represent the contents of the variables used by the message text",

-            "type": "string"

-        }

-    },

-    "required": [

-        "messageId",

-        "text"

-    ],

-    "type": "object"

-}

diff --git a/vid-app-common/src/main/resources/json/mso/requestInfo b/vid-app-common/src/main/resources/json/mso/requestInfo
deleted file mode 100755
index 5fcf74c7c..000000000
--- a/vid-app-common/src/main/resources/json/mso/requestInfo
+++ /dev/null
@@ -1,52 +0,0 @@
-{

-	"$schema": "http://json-schema.org/draft-04/schema#",

-	"description": "fields providing general context information for the request",

-	"properties": {

-		"billingAccountNumber": {

-			"description": "billing account associated with the model being operated on",

-			"type": "string"

-		},

-		"callbackUrl": {

-			"description": "client URL to use for asynchronous responses",

-			"type": "string"

-		},

-		"correlator": {

-			"description": "Optional correlationId for async callback requests",

-			"type": "string"

-		},

-		"instanceName": {

-			"description": "Client provided name for the instance being operated on by the operation (note: not guaranteed to be unique)",

-			"type": "string"

-		},

-		"orderNumber": {

-			"description": "reference to an order",

-			"type": "string"

-		},

-		"orderVersion": {

-			"description": "order version number",

-			"type": "number"

-		},

-		"productFamilyId": {

-			"description": "UUID for the product family associated with the model being operated on",

-			"type": "string"

-		},

-		"source": {

-			"description": "source of the request--not authoritative--actual source revealed via authentication",

-			"type": "string"

-		},

-		"suppressRollback": {

-			"description": "true or false boolean indicating whether rollbacks should be suppressed on failures",

-			"type": "boolean"

-		},

-		"responseValue": {

-			"description": "Is the user selected value based on the validResponses list provided to complete the manual task",

-			"type": "string"

-		},

-		"requestorId": {

-			"description": "The id of the person who initiated the completion request",

-			"type": "string"

-		}

-	},

-

-	"type": "object"

-}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/requestParameters b/vid-app-common/src/main/resources/json/mso/requestParameters
deleted file mode 100755
index 010d78713..000000000
--- a/vid-app-common/src/main/resources/json/mso/requestParameters
+++ /dev/null
@@ -1,23 +0,0 @@
-{

-  "$schema": "http://json-schema.org/draft-04/schema#",

-  "type": "object",

-  "properties": {

-        "subscriptionServiceType": {

-          "type": "string"

-        },

-        "userParams": {

-          "type": "array",

-          "items": {

-            "type": "object",

-            "properties": {

-              "name": {

-                "type": "string"

-              },

-              "value": {

-                "type": "string"

-              }

-            }

-          }

-        }

-      }

-    }
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/requestReferences b/vid-app-common/src/main/resources/json/mso/requestReferences
deleted file mode 100755
index 30f641190..000000000
--- a/vid-app-common/src/main/resources/json/mso/requestReferences
+++ /dev/null
@@ -1,18 +0,0 @@
-{

-    "$schema": "http://json-schema.org/draft-04/schema#",

-    "description": "provides the instanceId and requestId associated with the request",

-			"type": "object",

-			"properties": { 

-		        "instanceId": {

-			        "description": "UUID for the service instance",

-			        "type": "string",

-					"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"

-				},

-		        "requestId": {

-			        "description": "UUID for the request",

-			        "type": "string",

-					"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"

-				}

-			},

-			"required": [ "instanceId", "requestId" ]

-}

diff --git a/vid-app-common/src/main/resources/json/mso/requestStatus b/vid-app-common/src/main/resources/json/mso/requestStatus
deleted file mode 100755
index 75b72151b..000000000
--- a/vid-app-common/src/main/resources/json/mso/requestStatus
+++ /dev/null
@@ -1,32 +0,0 @@
-{

-    "$schema": "http://json-schema.org/draft-04/schema#",

-    "description": "fields describing the status of a request",

-    "properties": {

-        "percentProgress": {

-            "description": "percentage complete estimate from 0 to 100",

-            "type": "number"

-        },

-        "requestState": {

-            "description": "short description of the instantiation state",

-            "type": "string"

-        },

-        "statusMessage": {

-            "description": "additional descriptive information about the status",

-            "type": "string"

-        },

-        "timestamp": {

-            "description": "GMT Datetime the requestStatus was created e.g.: Wed, 15 Oct 2014 13:01:52 GMT",

-            "type": "string"

-        },

-        "wasRolledBack": {

-			"description": "true or false boolean indicating whether the request was rolled back",

-			"type": "boolean"

-		}

-        

-    },

-    "required": [

-        "requestState",

-        "timestamp"

-    ],

-    "type": "object"

-}

diff --git a/vid-app-common/src/main/resources/json/mso/response b/vid-app-common/src/main/resources/json/mso/response
deleted file mode 100755
index fa37d2db7..000000000
--- a/vid-app-common/src/main/resources/json/mso/response
+++ /dev/null
@@ -1,13 +0,0 @@
-{

-	"$schema": "http://json-schema.org/draft-04/schema#",

-	"description": "response structure",

-	"type": "object",

-	"code": {

-			"description": "Return code",

-			"type": "string"

-	},

-	"message": {

-		"description": "Result message",

-			"type": "string"

-	}

-}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/json/mso/subscriberInfo b/vid-app-common/src/main/resources/json/mso/subscriberInfo
deleted file mode 100755
index df787378b..000000000
--- a/vid-app-common/src/main/resources/json/mso/subscriberInfo
+++ /dev/null
@@ -1,19 +0,0 @@
-{

-	"$schema": "http://json-schema.org/draft-04/schema#",

-	"description": "fields providing information about the subscriber associated with the request",

-	"type": "object",

-	"properties": {

-		"globalSubscriberId": {

-			"description": "global Customer Id understood by A&AI",

-			"type": "string"

-		},

-		"subscriberCommonSiteId": {

-			"description": "id representing the location of the subscriber",

-			"type": "string"

-		},

-		"subscriberName": {

-			"description": "name of the customer or subscriber",

-			"type": "string"

-		}

-	}

-}
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/pnf.zip b/vid-app-common/src/main/resources/pnf.zip
index eb4248469..541d89ecf 100644
--- a/vid-app-common/src/main/resources/pnf.zip
+++ b/vid-app-common/src/main/resources/pnf.zip
diff --git a/vid-app-common/src/main/resources/sdcservices.json b/vid-app-common/src/main/resources/sdcservices.json
index e300597e5..965c9cebd 100644
--- a/vid-app-common/src/main/resources/sdcservices.json
+++ b/vid-app-common/src/main/resources/sdcservices.json
@@ -181,6 +181,48 @@
       "distributionStatus": "DISTRIBUTED",
       "artifacts": null,
       "resources": null
+    },
+    {
+      "uuid": "12344bb4-a416-4b4e-997e-0059973630b9",
+      "invariantUUID": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+      "name": "Fabric Configuration",
+      "version": "1.0",
+      "toscaModelURL": "./service-fabric-configuration.zip",
+      "category": "Mobility",
+      "lifecycleState": "CERTIFIED",
+      "lastUpdaterUserId": "rg276b",
+      "lastUpdaterFullName": null,
+      "distributionStatus": "DISTRIBUTED",
+      "artifacts": null,
+      "resources": null
+    },
+    {
+      "uuid": "1837481c-fa7d-4362-8ce1-d05fafc87bd1",
+      "invariantUUID": "93518289-3049-450f-a22d-86108c250265",
+      "name": "jenny vTSBC vlan SVC",
+      "version": "1.0",
+      "toscaModelURL": "./service-JennyVtsbcVlanSvc-csar.zip",
+      "category": "Network L1-3",
+      "lifecycleState": "CERTIFIED",
+      "lastUpdaterUserId": "rg276b",
+      "lastUpdaterFullName": null,
+      "distributionStatus": "DISTRIBUTED",
+      "artifacts": null,
+      "resources": null
+    },
+    {
+      "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+      "invariantUUID": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+      "name": "Grouping Service for Test",
+      "version": "1.0",
+      "toscaModelURL": "./service-vnf-grouping-csar.zip",
+      "category": "Network L4+",
+      "lifecycleState": "CERTIFIED",
+      "lastUpdaterUserId": "rg276b",
+      "lastUpdaterFullName": null,
+      "distributionStatus": "DISTRIBUTED",
+      "artifacts": null,
+      "resources": null
     }
   ]
 }
\ No newline at end of file
diff --git a/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip b/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip
index 1591a48ff..c1fb9e08a 100644
--- a/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip
+++ b/vid-app-common/src/main/resources/service-AmpPhSvc-csar.zip
diff --git a/vid-app-common/src/main/resources/service-vf-csar.zip b/vid-app-common/src/main/resources/service-vf-csar.zip
index c3a9fbbe9..3ecfa39a6 100644
--- a/vid-app-common/src/main/resources/service-vf-csar.zip
+++ b/vid-app-common/src/main/resources/service-vf-csar.zip
diff --git a/vid-app-common/src/main/resources/service-vf-with-annotations.zip b/vid-app-common/src/main/resources/service-vf-with-annotations.zip
index a6fcce7ae..79c5fb0ce 100644
--- a/vid-app-common/src/main/resources/service-vf-with-annotations.zip
+++ b/vid-app-common/src/main/resources/service-vf-with-annotations.zip
diff --git a/vid-app-common/src/main/resources/service-vl-csar.zip b/vid-app-common/src/main/resources/service-vl-csar.zip
index 121192ae1..dfe0b8370 100644
--- a/vid-app-common/src/main/resources/service-vl-csar.zip
+++ b/vid-app-common/src/main/resources/service-vl-csar.zip