aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2017-03-27 12:26:57 +0000
committerGerrit Code Review <gerrit@open-o.org>2017-03-27 12:26:57 +0000
commitea45874d18740ca6fe1326ce9be11261c1cda441 (patch)
treef83275ee8fef48f296e2e4617fa52c62021d1191
parentbaf88f107fe879b5ae99d324b5292dd5ee2222ae (diff)
parent4d91982b8c163bb1a32707af737544b1fdd6d747 (diff)
Merge "integrated vnf market function"
-rw-r--r--integration/pom.xml10
-rw-r--r--integration/src/main/resources/portalConfig/msb_register.xml10
-rw-r--r--login/src/main/webapp/login/html/menu.html10
-rw-r--r--login/src/main/webapp/login/js/app.js11
-rw-r--r--pom.xml1
5 files changed, 41 insertions, 1 deletions
diff --git a/integration/pom.xml b/integration/pom.xml
index c335b120..0ce32b69 100644
--- 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 61ff1787..2f9c60ad 100644
--- 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 db3f4067..58fbcc9b 100644
--- 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 6d3ac224..e08ad180 100644
--- 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 e6557507..88cdfa7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,5 +41,6 @@
<module>monitor</module>
<module>performance</module>
<module>resmgr</module>
+ <module>vnfmarket</module>
</modules>
</project>