ComponentBaseTest.java enhancement and

new onboarding class that test onboarding only

And merge release/1710 branch into master

Change-Id: I300d897b151010aa26f8732518fa2e3b7ed4291b
Issue-Id: SDC-331
Signed-off-by: Idan Amit <ia096e@intl.att.com>

2 files changed, 6 insertions, 1 deletions

diff --git a/catalog-ui/src/app/models/component-metadata.ts b/catalog-ui/src/app/models/component-metadata.ts
index 8c6ed5593d..1545739ce3 100644
--- a/catalog-ui/src/app/models/component-metadata.ts
+++ b/catalog-ui/src/app/models/component-metadata.ts
@@ -65,6 +65,7 @@ export class ComponentMetadata {
     public namingPolicy: string;
     public serviceType:string;
     public serviceRole:string;
+    public environmentContext:string;
 
 
     //backend lifecycleState
@@ -101,7 +102,7 @@ export class ComponentMetadata {
         this.projectCode = response.projectCode;
         this.resourceType = response.resourceType;
         this.csarUUID = response.csarUUID;
-        this.csarVersion = response.version;
+        this.csarVersion = response.csarVersion;
         this.state = response.state;
         this.ecompGeneratedNaming = response.ecompGeneratedNaming;
         this.namingPolicy = response.namingPolicy;
@@ -109,6 +110,7 @@ export class ComponentMetadata {
         this.resourceVendorModelNumber = response.resourceVendorModelNumber;
         this.serviceType = response.serviceType;
         this.serviceRole = response.serviceRole;
+        this.environmentContext = response.environmentContext;
         return this;
     }
 
diff --git a/catalog-ui/src/app/models/components/service.ts b/catalog-ui/src/app/models/components/service.ts
index 90a38e895b..ce6921b1bb 100644
--- a/catalog-ui/src/app/models/components/service.ts
+++ b/catalog-ui/src/app/models/components/service.ts
@@ -36,6 +36,7 @@ export class Service extends Component {
     public namingPolicy:string;
     public serviceType:string;
     public serviceRole:string;
+    public environmentContext:string;
 
     constructor(componentService:IServiceService, $q:ng.IQService, component?:Service) {
         super(componentService, $q, component);
@@ -47,6 +48,7 @@ export class Service extends Component {
             this.namingPolicy = component.namingPolicy;
             this.serviceType = component.serviceType;
             this.serviceRole = component.serviceRole;
+            this.environmentContext = component.environmentContext;
             if (component.categories && component.categories[0]) {
                 this.mainCategory = component.categories[0].name;
                 this.selectedCategory = this.mainCategory;
@@ -161,6 +163,7 @@ export class Service extends Component {
         this.namingPolicy = componentMetadata.namingPolicy;
         this.serviceType = componentMetadata.serviceType;
         this.serviceRole = componentMetadata.serviceRole;
+        this.environmentContext = componentMetadata.environmentContext;
         this.setComponentDisplayData();
     }