Bug 1383 Error when consulting NS instance's topology
* SOL006 Descriptor topology changes
Change-Id: I79afb00dfb54ce2c9dc02c0c4b7bbe435b07a915
Signed-off-by: Barath Kumar R <barath.r@tataelxsi.co.in>
diff --git a/src/models/NSDModel.ts b/src/models/NSDModel.ts
index 354ccde..131af47 100644
--- a/src/models/NSDModel.ts
+++ b/src/models/NSDModel.ts
@@ -18,21 +18,17 @@
/**
* @file Model for NSD related information.
*/
-
+// tslint:disable: completed-docs
import { VNFDAdminDetails } from './VNFDModel';
/** Interface for NSData */
export interface NSData {
- shortName?: string;
- identifier: string;
- description: string;
- vendor?: string;
+ id?: string;
+ identifier?: string;
+ description?: string;
version: string;
- page?: string;
name?: string;
- projectName?: string;
- userName?: string;
- username?: string;
+ designer?: string;
}
/** Interface for the nscompose descriptors content */
@@ -43,14 +39,16 @@
id: string;
logo: string;
name: string;
- 'short-name': string;
- vendor: string;
version: string;
vld: VLD[];
_admin: VNFDAdminDetails;
_id: string;
_links?: string;
'constituent-vnfr-ref': string[];
+ 'virtual-link-desc': VLD[];
+ df: DF[];
+ 'vnfd-id': string[];
+ designer?: string;
}
/** Interface for the connection-point */
@@ -68,27 +66,16 @@
/** Interface for the vld */
export interface VLD {
id: string;
- 'mgmt-network': boolean;
- name: string;
- 'short-name'?: string;
- 'type': string;
- 'vnfd-connection-point-ref'?: VNFDCONNECTIONPOINTREF[];
- 'vim-network-name': string;
+ 'mgmt-network'?: boolean;
}
-/** Interface for VNFDCONNECTIONPOINTREF */
-export interface VNFDCONNECTIONPOINTREF {
- 'member-vnf-index-ref': number;
- 'vnfd-connection-point-ref': string;
- 'vnfd-id-ref': string;
-}
/** Interface Nodes Creation */
export interface COMPOSERNODES {
id: string;
reflexive: Boolean;
'type': string;
name?: string;
- nodeIndex?: number;
+ nodeIndex?: string;
selectorId?: string;
x?: number;
y?: number;
@@ -110,20 +97,8 @@
y: number;
id: string;
'type'?: string;
-}
-
-/** Interface for the NSD */
-interface NSD {
- 'constituent-vnfd': CONSTITUENTVNFD[];
- description: string;
- id: string;
- name: string;
- 'short-name': string;
- vendor: string;
- version: string;
- vld: VLD[];
- _admin: VNFDAdminDetails;
- _id: string;
+ name?: string;
+ nodeIndex?: string;
}
/** Interface for the GRAPHDETAILS */
export interface GRAPHDETAILS {
@@ -181,3 +156,36 @@
'juju-bundle': string;
'kdu-configuration': {};
}
+
+/** Interface for the DF */
+export interface DF {
+ id: string;
+ 'vnf-profile': VNFPROFILE[];
+}
+
+/** Interface for the DF */
+export interface VNFPROFILE {
+ id: string;
+ 'virtual-link-connectivity': VLC[];
+ 'vnfd-id': string;
+}
+
+/** Interface for the VLC */
+export interface VLC {
+ 'constituent-cpd-id': CCI[];
+ 'virtual-link-profile-id': string;
+}
+
+/** Interface for the CCI */
+export interface CCI {
+ 'constituent-base-element-id': string;
+ 'constituent-cpd-id': string;
+}
+/** Interface for NSDATACREATION */
+export interface NSDATACREATION {
+ nsd: NSDETAILDATA;
+}
+/** Interface for NSDETAILDATA */
+export interface NSDETAILDATA {
+ nsd: NSDDetails[];
+}