Feature: 11055 Support of several node groups in clusters created by OSM
- Added control plane support in managed post
- When aws vim account is selected paylaod will get differed
- Added details page in clusters to view node and ksu for
specified cluster
- Fixed Bug 2402 - Unable to create Ns Config template from Ui
bug by chnaging api
Change-Id: I4eb327fd86b0c4a706b05a8ed10524e4d2c5bc95
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
diff --git a/src/models/CommonModel.ts b/src/models/CommonModel.ts
index 001d970..f29ee68 100644
--- a/src/models/CommonModel.ts
+++ b/src/models/CommonModel.ts
@@ -70,14 +70,14 @@
sdnOperationalStateFirstStep = 'PROCESSING',
sdnOperationalStateStateSecondStep = 'ENABLED',
sdnOperationalStateThirdStep = 'ERROR',
- k8OperationalStateFirstStep = 'CREATED',
- k8OperationalStateStateSecondStep = 'IN_CREATION',
- k8OperationalStateThirdStep = 'IN_DELETION',
- k8OperationalStateFourthStep = 'FAILED_DELETION',
- k8OperationalStateFifthStep = 'FAILED_CREATION',
- k8OperationalStateSixthStep = 'N/A',
- clusterModeFirstStep = 'MANAGED',
- clusterModeSecondStep = 'REGISTERED',
+ k8OperationalStateFirstStep = 'READY',
+ k8OperationalStateStateSecondStep = 'ERROR',
+ k8OperationalStateThirdStep = 'IN_PROGRESS',
+ k8OperationalStateFourthStep = 'N/A',
+ k8OperationalStateFifthStep = 'ENABLED',
+ k8OperationalStateSixthStep = 'DEGRADED',
+ clusterModeFirstStep = 'managed',
+ clusterModeSecondStep = 'registered',
done = 'done',
close = 'close',
userActive = 'active',
@@ -137,6 +137,8 @@
createdbyosm?: string;
bootstrap?: boolean;
key?: boolean;
+ cluster_mode?: string;
+ cluster_id?: string;
operationType?: string;
}
/** Handle the Delete params */
@@ -152,6 +154,7 @@
createdbyosm?: string;
bootstrap?: boolean;
key?: boolean;
+ cluster_id?: string;
}
/** Interface for the Delete Details */
diff --git a/src/models/K8sModel.ts b/src/models/K8sModel.ts
index 06a13b2..0843033 100644
--- a/src/models/K8sModel.ts
+++ b/src/models/K8sModel.ts
@@ -21,23 +21,47 @@
/** Interface for K8SCLUSTERDATA */
export interface K8SCLUSTERDATA {
- credentials: Credentials;
- description: string;
- k8s_version: number;
- name: string;
- namespace: string;
- nets: Nets;
- schema_version: string;
- vim_account: string;
- _admin: Admin;
- _id: string;
+ credentials?: Credentials;
+ description?: string;
+ k8s_version?: number;
+ name?: string;
+ namespace?: string;
+ nets?: Nets;
+ schema_version?: string;
+ vim_account?: string;
+ _admin?: Admin;
+ _id?: string;
state?: string;
resourceState?: string;
created?: string;
bootstrap?: boolean;
key?: string;
+ cloud_type?: string;
+ cluster_mode?: string;
node_count?: number;
- node_size?: number;
+ node_size?: string;
+ ksu_count?: number;
+ cluster_name?: string;
+ private_subnet?: string[];
+ public_subnet?: string[];
+ cluster_id?: string;
+ count?: number;
+ package_name?: string;
+ package_path?: string;
+ data?: K8SNODEDATA[];
+}
+/** Interface for K8SCLUSTERDATA */
+export interface K8SNODEDATA {
+ description: string;
+ name: string;
+ package_name?: string;
+ package_path?: string;
+ _admin: Admin;
+ _id: string;
+ state?: string;
+ resourceState?: string;
+ node_count?: number;
+ node_size?: string;
}
/** Interface for K8SCLUSTERDATA */
export interface K8SREPODATA {
@@ -117,10 +141,10 @@
name: string;
identifier: string;
operationalState?: string;
- version: number;
+ version?: number;
created?: string;
modified?: string;
- pageType: string;
+ pageType?: string;
description?: string;
default?: boolean;
state?: string;
@@ -128,6 +152,14 @@
bootstrap?: boolean;
key?: boolean;
clusterMode?: string;
+ nodeCount?: number;
+ nodeSize?: string;
+ cloud_type?: string;
+ cluster_mode?: string;
+ cluster_name?: string;
+ cluster_id?: string;
+ package_name?: string;
+ package_path?: string;
}
/** Interface for the K8SCLUSTERDATA Return to Display */
export interface K8SREPODATADISPLAY {
@@ -144,6 +176,9 @@
createdbyosm?: boolean;
bootstrap?: boolean;
key?: boolean;
+ cloud_type?: string;
+ cluster_mode?: string;
+ cluster_id?: string;
}
/** Interface for the Create cluster */
@@ -187,6 +222,9 @@
createdbyosm?: boolean;
bootstrap?: boolean;
key?: boolean;
+ cluster_mode?: string;
+ cluster_id?: string;
+ resourceState?: string;
}
/** Interface for the KSU */
diff --git a/src/models/MenuModel.ts b/src/models/MenuModel.ts
index 1e60f28..f3dbf66 100644
--- a/src/models/MenuModel.ts
+++ b/src/models/MenuModel.ts
@@ -224,6 +224,16 @@
{
liClass: '',
anchorTagClass: 'link',
+ routerLink: '/k8s/ksu',
+ routerLinkActive: childActiveClass,
+ routerLinkActiveOptions: false,
+ icon: 'fas fa-anchor',
+ menuName: 'PAGE.K8S.KSU',
+ isChildExists: false
+ },
+ {
+ liClass: '',
+ anchorTagClass: 'link',
routerLink: '/k8s/infra-config-profile',
routerLinkActive: childActiveClass,
routerLinkActiveOptions: false,
@@ -260,16 +270,6 @@
icon: 'fas fa-archive',
menuName: 'PAGE.K8S.RESOURCE',
isChildExists: false
- },
- {
- liClass: '',
- anchorTagClass: 'link',
- routerLink: '/k8s/ksu',
- routerLinkActive: childActiveClass,
- routerLinkActiveOptions: false,
- icon: 'fas fa-anchor',
- menuName: 'PAGE.K8S.KSU',
- isChildExists: false
}
]
},
diff --git a/src/models/VNFDModel.ts b/src/models/VNFDModel.ts
index 2334538..022739d 100644
--- a/src/models/VNFDModel.ts
+++ b/src/models/VNFDModel.ts
@@ -86,6 +86,7 @@
kdu?: [];
name?: string;
state?: string;
+ resourceState?: string;
profile_type?: string;
}
/** Interface for DF */