integrated vnf market function

Issue-id: CLIENT-175

Change-Id: Ide55ebd9b742b3c8e1a619bf36981e2f0530c976
Signed-off-by: “shentao” <shentao@chinamobile.com>

diff --git a/integration/pom.xml b/integration/pom.xml
index c335b12..0ce32b6 100644 (file)
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -134,6 +134,12 @@
             <version>1.1.0-SNAPSHOT</version>
             <type>war</type>
         </dependency>
+        <dependency>
+            <groupId>org.openo.client.gui</groupId>
+            <artifactId>vnfmarket</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
     </dependencies>
 
     <build>
@@ -181,6 +187,10 @@
                             <groupId>org.openo.client.gui</groupId>
                             <artifactId>resmgr</artifactId>
                         </overlay>
+                        <overlay>
+                            <groupId>org.openo.client.gui</groupId>
+                            <artifactId>vnfmarket</artifactId>
+                        </overlay>
                     </overlays>
                 </configuration>
             </plugin>

diff --git a/integration/src/main/resources/portalConfig/msb_register.xml b/integration/src/main/resources/portalConfig/msb_register.xml
index 61ff178..2f9c60a 100644 (file)
--- a/integration/src/main/resources/portalConfig/msb_register.xml
+++ b/integration/src/main/resources/portalConfig/msb_register.xml
@@ -131,5 +131,15 @@
             <lb_policy>hash</lb_policy>
             <ttl>0</ttl>
         </registerInfo>
+        <registerInfo>
+            <ip>127.0.0.1</ip>
+            <port>9150</port>
+            <url>/openoui/vnfmarket</url>
+            <serviceName>vnfmarket</serviceName>
+            <protocol>UI</protocol>
+            <visualRange>1</visualRange>
+            <lb_policy>hash</lb_policy>
+            <ttl>0</ttl>
+        </registerInfo>
     </registerList>
 </msbRegister>

diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html
index db3f406..58fbcc9 100644 (file)
--- a/login/src/main/webapp/login/html/menu.html
+++ b/login/src/main/webapp/login/html/menu.html
@@ -47,7 +47,7 @@
                 </li>
                 <li>
                     <div class="link">
-                        <i class="fa fa-puzzle-piece"></i>Orchestrator<i class="fa fa-chevron-down"></i>
+                        <i class="fa fa-edit"></i>Orchestrator<i class="fa fa-chevron-down"></i>
                     </div>
                     <ul class="submenu">
                         <li><a ui-sref=".modelDesign" ui-sref-active="submenu_active">Model Design</a></li>
@@ -82,6 +82,14 @@
                         <li><a ui-sref=".parameterSetting" ui-sref-active="submenu_active">Parameter Setting</a></li>
                     </ul>
                 </li>
+                <li>
+                    <div class="link">
+                        <i class="fa fa-puzzle-piece"></i>Market<i class="fa fa-chevron-down"></i>
+                    </div>
+                    <ul class="submenu">
+                        <li><a ui-sref=".vnfMarket" ui-sref-active="submenu_active">VNF Market Place</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
     </div>

diff --git a/login/src/main/webapp/login/js/app.js b/login/src/main/webapp/login/js/app.js
index 6d3ac22..e08ad18 100644 (file)
--- a/login/src/main/webapp/login/js/app.js
+++ b/login/src/main/webapp/login/js/app.js
@@ -103,6 +103,12 @@ var app = angular.module("POCApp", ["ui.router", "ngTable"])
                 controller : "parameterSettingCtrl",
                 authenticate: true
             })
+            .state("menu.vnfMarket", {
+                url: "/vnfMarket",
+                templateUrl : "/openoui/vnfMarket/index.html",
+                controller : "vnfMarketCtrl",
+                authenticate: true
+            })
     })
 
     /*Login Controller*/
@@ -214,6 +220,11 @@ var app = angular.module("POCApp", ["ui.router", "ngTable"])
         $scope.message = "Parameter Setting";
     })
 
+    /*VNF Market Controller*/
+    .controller("vnfMarketCtrl", function($scope, DataService, $log){
+        $scope.message = "VNF Market";
+    })
+
 var modelTemplate = "";
 function loadTemplate() {
     $.get('/openoui/framework/template.html', function (template) {

diff --git a/pom.xml b/pom.xml
index e655750..88cdfa7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -41,5 +41,6 @@
         <module>monitor</module>
         <module>performance</module>
         <module>resmgr</module>
+        <module>vnfmarket</module>
     </modules>
 </project>