Advanced Cluster Management - NGUI
- Added new OKA packages module under packages
- Added Profiless, KSU under k8s section
- Feature 11020. 11022, 11023, 11024, 11025, 11026
Change-Id: Ibddeb4d5693ce24d80e378277693405c810f6e04
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
diff --git a/src/models/CommonModel.ts b/src/models/CommonModel.ts
index 271b297..0b85878 100644
--- a/src/models/CommonModel.ts
+++ b/src/models/CommonModel.ts
@@ -70,9 +70,11 @@
sdnOperationalStateFirstStep = 'PROCESSING',
sdnOperationalStateStateSecondStep = 'ENABLED',
sdnOperationalStateThirdStep = 'ERROR',
- k8OperationalStateFirstStep = 'PROCESSING',
- k8OperationalStateStateSecondStep = 'ENABLED',
- k8OperationalStateThirdStep = 'ERROR',
+ k8OperationalStateFirstStep = 'CREATED',
+ k8OperationalStateStateSecondStep = 'IN_CREATION',
+ k8OperationalStateThirdStep = 'IN_DELETION',
+ k8OperationalStateFourthStep = 'FAILED_DELETION',
+ k8OperationalStateFifthStep = 'FAILED_CREATION',
done = 'done',
close = 'close',
userActive = 'active',
diff --git a/src/models/K8sModel.ts b/src/models/K8sModel.ts
index 4e83483..307cb34 100644
--- a/src/models/K8sModel.ts
+++ b/src/models/K8sModel.ts
@@ -31,6 +31,7 @@
vim_account: string;
_admin: Admin;
_id: string;
+ state?: string;
}
/** Interface for K8SCLUSTERDATA */
export interface K8SREPODATA {
@@ -44,7 +45,7 @@
_id: string;
}
/** Interface for the Credentials */
-interface Credentials{
+interface Credentials {
apiVersion: string;
clusters: Clusters[];
contexts: Contexts[];
@@ -64,7 +65,7 @@
server: string;
}
/** Interface for the Contexts */
-interface Contexts{
+interface Contexts {
context: Context;
name: string;
}
@@ -74,7 +75,7 @@
user: string;
}
/** Interface for the Users */
-interface Users{
+interface Users {
name: string;
user: User;
}
@@ -84,16 +85,16 @@
'client-key-data': string;
}
/** Interface for the K8SCLUSTERDATA nets */
-interface Nets{
+interface Nets {
net1: string;
}
/** Interface for the K8SCLUSTERDATA _admin */
-interface Admin{
+export interface Admin {
created: string;
- current_operation: number;
- 'helm-chart': HelmChart;
- 'juju-bundle': JujuBundle;
- operationalState: string;
+ current_operation?: number;
+ 'helm-chart'?: HelmChart;
+ 'juju-bundle'?: JujuBundle;
+ operationalState?: string;
modified: string;
}
/** Interface for the K8SCLUSTERDATA _admin Helm chart */
@@ -106,7 +107,7 @@
error_msg: string;
}
/** Interface for the K8SCLUSTERDATA Return to Display */
-export interface K8SCLUSTERDATADISPLAY{
+export interface K8SCLUSTERDATADISPLAY {
name: string;
identifier: string;
operationalState: string;
@@ -114,6 +115,9 @@
created: string;
modified: string;
pageType: string;
+ description?: string;
+ default?: boolean;
+ state?: string;
}
/** Interface for the K8SCLUSTERDATA Return to Display */
export interface K8SREPODATADISPLAY {
@@ -124,4 +128,102 @@
created: string;
modified: string;
pageType: string;
+ description?: string;
+ default?: boolean;
+ state?: string;
+}
+
+/** Interface for the Create cluster */
+export interface K8SCreateCLUSTERDATA {
+ _id?: string,
+ description?: string,
+ k8s_version?: string,
+ location?: string,
+ name?: string,
+ node_count?: number,
+ 'node_size/node_type'?: string,
+ vim_account?: string
+ _admin?: Admin;
+ infra_config_profiles?: ProfileMappings[];
+ default?: boolean;
+}
+
+/** Interface for the K8SCLUSTERDATA */
+export interface K8SCREATEDATADISPLAY {
+ name: string;
+ identifier: string;
+ version: string;
+ created: string;
+ modified: string;
+ default?: boolean;
+ description?: string;
+}
+
+/** Interface for the Profile payload */
+export interface INFRACONFIGPAYLOAD {
+ name?: string;
+ _id?: string,
+ description?: string;
+ identifier?: string;
+ pageType?: string
+ _admin?: Admin;
+ created?: string;
+ modified?: string;
+ ksus?: KSU[];
+ state?: string;
+}
+
+/** Interface for the KSU */
+export interface KSU {
+ name?: string;
+ description?: string;
+ profile?: PROFILE;
+ oka?: OKA[];
+}
+
+/** Interface for Project */
+export interface PROFILE {
+ _id?: string;
+ sw_catalog_path?: string;
+ profile_type?: string;
+ name?: string;
+}
+
+/** Interface for OKA */
+export interface OKA {
+ _id?: string;
+ sw_catalog_path?: string;
+ transformation?: {};
+}
+
+
+/** Interface for the K8S payload */
+export interface K8SPayload {
+ name?: string;
+ location?: string;
+ vim_account?: string;
+ description?: string;
+ k8s_version?: string;
+ node_count?: number;
+ region_name?: string;
+ resource_group?: string;
+ 'node_size'?: string;
+}
+
+/** Interface for Profile Mappings */
+export interface ProfileMappings {
+ _id?: string;
+ name?: string;
+ profile_name?: string;
+}
+
+/** Interface for profile mappings */
+export interface ProfileMap {
+ add_profile?: ProjectRoleMappings[];
+ remove_profile?: ProjectRoleMappings[];
+}
+
+/** Interface for ProfileMappings */
+export interface ProjectRoleMappings {
+ id?: string;
}
diff --git a/src/models/MenuModel.ts b/src/models/MenuModel.ts
index 9ec1472..1e60f28 100644
--- a/src/models/MenuModel.ts
+++ b/src/models/MenuModel.ts
@@ -74,6 +74,16 @@
{
liClass: '',
anchorTagClass: 'link',
+ routerLink: '/packages/oka',
+ routerLinkActive: childActiveClass,
+ routerLinkActiveOptions: false,
+ icon: 'fas fa-box-open',
+ menuName: 'PAGE.K8S.OKAPACKAGES',
+ isChildExists: false
+ },
+ {
+ liClass: '',
+ anchorTagClass: 'link',
routerLink: '/packages/netslice',
routerLinkActive: childActiveClass,
routerLinkActiveOptions: false,
@@ -210,6 +220,56 @@
icon: 'fas fa-flag',
menuName: 'PAGE.K8S.MENUK8SREPO',
isChildExists: false
+ },
+ {
+ liClass: '',
+ anchorTagClass: 'link',
+ routerLink: '/k8s/infra-config-profile',
+ routerLinkActive: childActiveClass,
+ routerLinkActiveOptions: false,
+ icon: 'fas fa-list-alt',
+ menuName: 'PAGE.K8S.INFRACONFIG',
+ isChildExists: false
+ },
+ {
+ liClass: '',
+ anchorTagClass: 'link',
+ routerLink: '/k8s/infra-controller-profile',
+ routerLinkActive: childActiveClass,
+ routerLinkActiveOptions: false,
+ icon: 'fas fa-gamepad',
+ menuName: 'PAGE.K8S.INFRACONTROLLER',
+ isChildExists: false
+ },
+ {
+ liClass: '',
+ anchorTagClass: 'link',
+ routerLink: '/k8s/app-profile',
+ routerLinkActive: childActiveClass,
+ routerLinkActiveOptions: false,
+ icon: 'fas fa-film',
+ menuName: 'PAGE.K8S.APP',
+ isChildExists: false
+ },
+ {
+ liClass: '',
+ anchorTagClass: 'link',
+ routerLink: '/k8s/resource-profile',
+ routerLinkActive: childActiveClass,
+ routerLinkActiveOptions: false,
+ 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 9072431..cb9c6b9 100644
--- a/src/models/VNFDModel.ts
+++ b/src/models/VNFDModel.ts
@@ -84,6 +84,8 @@
_links?: string;
'vnf-configuration'?: VNFCONFIG[];
kdu?: [];
+ name?: string;
+ state?: string;
}
/** Interface for DF */
export interface VNFCONFIG {
@@ -267,11 +269,15 @@
identifier?: string;
id?: string;
name?: string;
- description: string;
- version: string;
+ description?: string;
+ version?: string;
'type'?: string;
productName?: string;
provider?: string;
+ onboardingState?: string;
+ usageState?: string;
+ created?: string;
+ state?: string;
}
/** Interface for the Tick */