<url>http://maven.apache.org</url>
<dependencies>
-
+
+ <dependency>
+ <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+ <artifactId>getBackupVnfDetailService</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onap.sdnc.oam.vnfbackup</groupId>
+ <artifactId>vnfconfigreportsservice</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
+++ /dev/null
-server.port = 9003
-#server.error.whitelabel.enabled=false
-spring.mvc.view.prefix = /WEB-INF/views/
-spring.mvc.view.suffix = .jsp
-#
-#spring.datasource.url=jdbc:mariadb://localhost:3306/testreports?useSSL=false
-##spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false
-##spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-#spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-#spring.datasource.name=mysql
-#spring.jpa.database=testreports
-#spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
-##org.hibernate.dialect.MySQLDialect
-#
-#
-#spring.datasource.username=root
-#spring.datasource.password=12345
-#spring.jpa.generate-ddl=true
-#spring.datasource.tomcat.max-wait=20000
-#spring.datasource.tomcat.max-active=50
-#spring.datasource.tomcat.max-idle=20
-#spring.datasource.tomcat.min-idle=15
-#
-spring.jpa.hibernate.ddl-auto=update
-#
-#spring.jpa.properties.hibernate.dialect =org.hibernate.dialect.MySQL5InnoDBDialect
-## org.hibernate.dialect.MySQLDialect
-#
-#spring.jpa.properties.hibernate.id.new_generator_mappings = false
-#spring.jpa.properties.hibernate.format_sql = true
-#
-#logging.level.org.hibernate.SQL=DEBUG
-#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
-sdnc.rest.vnf.api.host=10.53.172.121
-sdnc.rest.vnf.api.port=8282
-sdnc.rest.vnf.api.basepath=/restconf
-sdnc.rest.vnf.api.username=admin
-sdnc.rest.vnf.api.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
-spring.jackson.serialization.fail-on-empty-beans=false
-
-server.tomcat.uri-encoding=utf-8
-
-#server.error.whitelabel.enabled=false
-#spring.mvc.view.prefix = /WEB-INF/views/
-#spring.mvc.view.suffix = .jsp
-
-logging.level.org.springframework=TRACE
-logging.level.com=TRACE
-
-# ===============================
-# Set here configurations for the database connection
-spring.datasource.url=jdbc:mariadb://localhost:3306/configtest
-spring.datasource.username=root
-spring.datasource.password=root
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-# Keep the connection alive if idle for a long time (needed in production)
-spring.datasource.testWhileIdle=true
-spring.datasource.validationQuery=SELECT 1
-# ===============================
-# = JPA / HIBERNATE
-# ===============================
-# Show or not log for each sql query
-spring.jpa.show-sql=true
-# Hibernate ddl auto (create, create-drop, update): with "create-drop" the database
-# schema will be automatically created afresh for every start of application
-#spring.jpa.hibernate.ddl-auto=validate
-# Naming strategy
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
-spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
-# Allows Hibernate to generate SQL optimized for a particular DBMS
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
--- /dev/null
+server.port = 9003
+
+spring.mvc.view.prefix = /WEB-INF/views/
+spring.mvc.view.suffix = .jsp
+
+sdnc.rest.vnf.api.host=10.53.172.134
+sdnc.rest.vnf.api.port=8282
+sdnc.rest.vnf.api.basepath=/restconf
+sdnc.rest.vnf.api.username=admin
+sdnc.rest.vnf.api.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+
+# ===============================
+# Set here configurations for the database connection
+spring.datasource.url=jdbc:mariadb://localhost:3306/configtest
+spring.datasource.username=root
+spring.datasource.password=root
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+# Keep the connection alive if idle for a long time (needed in production)
+spring.datasource.testWhileIdle=true
+spring.datasource.validationQuery=SELECT 1
+# ===============================
+# = JPA / HIBERNATE
+# ===============================
+# Show or not log for each sql query
+spring.jpa.show-sql=true
+# Hibernate ddl auto (create, create-drop, update): with "create-drop" the database
+# schema will be automatically created afresh for every start of application
+spring.jpa.hibernate.ddl-auto=update
+# Naming strategy
+spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
+spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
+# Allows Hibernate to generate SQL optimized for a particular DBMS
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
\ No newline at end of file
//THIS FUNCTION WILL BE CALLED ON PAGE LOAD
$scope.getAllVNFFromRc = function() {
- deviceConfigService.getAllVNFFromRc().then(function(data) {
+ deviceConfigService.getAllVnfIds().then(function(data) {
if (data != null) {
console.log(data);
- $scope.objvnfList = data;
+ $scope.objvnfList= data['vnfDisplayList'];
console.log("CompareConfigCtrl:getAllVNFFromRc called" + $scope.objvnfList);
} else {
$scope.warningMessage = "No VNF is eligible for configuration!!!";
$scope.getAllVNFFromRc();
-
+ $scope.ShowResult=false;
$scope.selectVnf = function(selectedValueVnf) {
-
+ if (selectedValueVnf != null && selectedValueVnf != "") {
+ $scope.ShowResult=true;
var vnfId = selectedValueVnf;
-
- $scope.fileContent = '';
+ $scope.successMessagebool1 = false;
+ $scope.fileContent = '';
$scope.fileSize = 0;
$scope.fileName = '';
-
+
$scope.submit = function () {
var file = document.getElementById("myFileInput").files[0];
$scope.result1={};
-
if (file) {
var aReader = new FileReader();
aReader.readAsText(file, "UTF-8");
aReader.onload = function (evt) {
- // $scope.fileContent = aReader.result;
$scope.fileName = document.getElementById("myFileInput").files[0].name;
$scope.fileSize = document.getElementById("myFileInput").files[0].size;
var id= vnfId;
result1=JSON.parse(aReader.result);
- /*var item = JSON.parse(result1);*/
$scope.fileContent = aReader.result.search(id);
$scope.successMessagebool = false;
if( $scope.fileContent == -1){
disableCountDown: true
});
}
- else{
-
+ else{
$scope.apply();
-
}
}
aReader.onerror = function (evt) {
$scope.fileContent = "error";
}
- }
- $scope.successMessagebool1 = false;
+
+ }else{
+ $scope.errorMessage = "Please select file!!!!";
+ growl.error($scope.errorMessage, {
+ title: 'Error!',
+ globalDisableCloseButton: false,
+ ttl: 7000,
+ disableCountDown: true
+ });
+ }
+
$scope.apply = function() {
if (file) {
deviceConfigService.runApplyconfig(vnfId,result1);
disableCountDown: true
});
$scope.successMessagebool1 = true;
-
-
} };
- }
+ }; } else {
+ $scope.ShowResult = false;
+ $scope.showCompare = false;
+ $scope.showResult = false;
+ $scope.errorMessage = "Please select a VNF!!!";
+ growl.error($scope.errorMessage, {
+ title: 'Error!',
+ globalDisableCloseButton: false,
+ ttl: 7000,
+ disableCountDown: true
+ });
+ }
- }
+ };
-}]);
-
+}]);
\ No newline at end of file
$scope.itemsPerPage = 5;
$scope.pagedItems = [];
$scope.currentPage = 0;
+ $scope.version1=false;
+ $scope.version2=false;
+ $scope.version3=false;
+ $scope.version4=false;
//THIS FUNCTION WILL BE CALLED ON PAGE LOAD
$scope.getAllVNF = function() {
if (selectedValueVnf != null && selectedValueVnf != "") {
console.log("selectedvnf Value", selectedValueVnf);
- //selectedItem = selectedValueVnf.split("%");
-// var vnfName = selectedItem[0];
-// var vnfType = selectedItem[1];
var vnfId = selectedValueVnf;
$scope.getVersionList(vnfId);
} else {
$scope.versionsSelected = [];
angular.forEach(objVersion, function(item) {
angular.forEach($scope.objVersionModel, function(val, index) {
- /* if (item.vnfversion == val['vnfversion'] && item.selected == false) {
- $scope.objVersionModel.splice(index, 1);
- }*/
if (item.selected) {
if ($scope.versionsSelected.indexOf(item) == -1)
$scope.versionsSelected.push(item);
versionDetails.vnfversion = item['vnfversion'];
versionDetails.vnfName = item['vnfname'];
var vnfid = item['vnfid'];
- // var config = JSON.parse(item['configinfo']);
var config = item['configinfo'];
var config1=JSON.parse(config);
console.log("CompareConfigCtrl::createCompareModel::objCompareModel1", config1);
deviceConfigService.runApplyconfig(vnfid,config1);
+ $scope.showResult = false;
$scope.successMessage = "File uploaded successfully";
growl.success($scope.successMessage, {
title: 'Success!',
$scope.versionsSelected = [];
angular.forEach(objVersion, function(item) {
angular.forEach($scope.objVersionModel, function(val, index) {
- /*if (item.vnfversion == val['vnfversion'] && item.selected == false) {
- $scope.objVersionModel.splice(index, 1);
- }*/
if (item.selected) {
if ($scope.versionsSelected.indexOf(item) == -1)
$scope.versionsSelected.push(item);
versionObj.versionDetails = versionDetails;
//fetch all the other topology/network,opertaion status for the vnf
- // versionObj.topologyInfo = $scope.fetchConfigDetails(item);
versionObj.topologyInfo = $scope.fetchTopologyInfo(item);
versionObj.vnfIdInfo = $scope.fetchVnfId(item);
versionObj.serviceStatusInfo= $scope.fetchServiceStatus(item);
$scope.versionsSelected = [];
angular.forEach(objVersion, function(item) {
angular.forEach($scope.objVersionModel, function(val, index) {
- /*if ((item.vnfversion == val['vnfversion']) && item.selected == false) {
- // $scope.objVersionModel.splice(index, 1);
- }*/
if (item.selected) {
if ($scope.versionsSelected.indexOf(item) == -1)
$scope.versionsSelected.push(item);
var versionObj = {};
var versionDetails = {};
versionDetails.vnfversion = item.vnfversion;
- /*versionDetails.vnfName = item['vnfname'];
- versionDetails.vnfid = item['vnfid'];*/
versionDetails.timeStamp = item.createdAt;
versionObj.versionDetails = versionDetails;
//fetch all the other topology/network,opertaion status for the vnf
- // versionObj.topologyInfo = $scope.fetchConfigDetails(item);
versionObj.topologyInfo = $scope.fetchTopologyInfo(item);
versionObj.vnfIdInfo = $scope.fetchVnfId(item);
versionObj.serviceStatusInfo= $scope.fetchServiceStatus(item);
if ((versionObj.versionDetails.vnfversion == $scope.versionsSelected[0].vnfversion)) {
$scope.objCompareModel1 = versionObj;
+ $scope.version1=true;
} else if ((versionObj.versionDetails.vnfversion == $scope.versionsSelected[1].vnfversion))
{$scope.objCompareModel2 = versionObj;
- }
+ $scope.version2=true;
+ $scope.version3=false;
+ $scope.version4=false;
+ }else if((versionObj.versionDetails.vnfversion == $scope.versionsSelected[2].vnfversion)){
+ $scope.objCompareModel3 = versionObj;
+ $scope.version3=true;
+ $scope.version4=false;
+ }else if((versionObj.versionDetails.vnfversion == $scope.versionsSelected[3].vnfversion)){
+ $scope.objCompareModel4 = versionObj;
+ $scope.version4=true;
+ }
document.getElementById("view").style.display = "none";
} );
$scope.showResult = true;
});
};
-
-
+
this.getAllVNF = function() {
var testlist = {};
return $http.get('/getAllBackupVnfIds')
};
+ this.getAllVnfIds = function() {
+ var rctestlist = {};
+ return $http.get('/getAllVnfIds')
+ .then(function(response) {
+ console.log("---validationTestService::getAllVNF From Restconf::TestResponse---" + JSON.stringify(response));
+ vnflist = response.data;
+ return vnflist;
+ },
+ function(response) {
+ console.log("validationTestService::getAllVNF From Restconf::Status Code", response.status);
+ return response;
+ });
+
+ };
+
this.getVersions = function(vnfId) {
var data = {};
-// data.selectedVnfName = vnfName;
-// data.selectedVnfType = vnfType;
data.vnfId = vnfId;
var config = {
params: data,
console.log("deviceConfigService::getVersions::config", JSON.stringify(config));
var baseUrl = VNF_API_BASE;
- // var baseApi='runtest';
- // var apiUrl= baseUrl + baseApi;
-
- // Call the pre validation service
var request = {
method: 'GET',
url: '/configDetailsById/'+vnfId,
- //url: 'sdnc-stubs/getAllConfigForVNF.json',
- //data: data,
headers: {
'Content-Type': 'application/json',
console.log("validationTestService::getAllVNF::Status Code", response);
return newConfig;
});
- /*.then(function (response) {
- if (response.data)
- { $scope.successMessage1 = "Put Data Method Executed Successfully!";
- return response;
- }
- var status= response.status;
- if (status == 200){
- $window.alert("applyed successfully ");
- }
- var successMessage1 = "Put Data Method Executed Successfully!";
- },
- function (response) {
- var successMessage1 = "Service not Exists";
- });
-
- */
};
}
-.columnsVersion {
- float: left;
- width: 33.3%;
- padding: 8px;
- border-radius: 15px;
-}
-
.columnsVersionview{
float: left;
width: 50%;
.listHeading{
background-color: #ffcccc;
}
+table.tableCompare{
+ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+ border-collapse: collapse;
+ width: 100%;
+ table-layout: auto;
+}
+ table.tableCompare tr:nth-child(even){
+ background-color: #E1E0DA;
+}
+ table.tableCompare th{
+ padding-top: 12px;
+ padding-bottom: 12px;
+ text-align: left;
+ background: linear-gradient(to top, #f8f8f8 0%, #cce5ff 83%);
+ color: black;
+}
+ table.tableCompare td,table.tableCompare th {
+ min-width:100px;
+ padding: 3px;
+ height:10%;
+ max-width:200px;
+}
+ table.tableCompare tr:{
+ text-align: left;
+ height:105;;
+}
*/
-->
<div class="ReportMain" >
- <div class="heading"><img src="static/images/Apply.jpg" width=70 height="40" style="margin-left:5px;"> Apply Configruation</div>
- <form name="myForm" style="background-color:#f2f2f2; border: 1px solid #ddd;">
+ <div class="heading"><img src="static/images/Apply.jpg" width=50 height="40" style="margin-left:5px;"> Apply Configruation</div>
+ <form name="myForm" style="background-color: #f2f2f2;padding:20px 15px;border: 1px ridge #ddd">
<div growl></div>
- <div class="row" style="background-color:#f2f2f2;width:100%;margin-left:1px;height:75px">
- <div class="column" style="width:30%;background-color:#f2f2f2;height:55px;margin-left:40px;">
- <label class="labeltext">Select Avaliable VNF</label>
- </div>
- <div class="column" style="background-color:#f2f2f2;width:60%;height:55px;margin-left:0px;">
- <select class="form-control" style="width:100%;margin-top:0px;" ng-model="selectedValueVnf" ng-change="selectVnf(selectedValueVnf)">
- <option ng-repeat="vnf in objvnfList" value="{{vnf.vnfid}}">VnfId- {{vnf.vnfid}} VnfName- {{vnf.vnfname}}</option>
- <option value="">Select VNFId</option>
- </select>
- </div>
- </div>
- <div class="row" style="background-color:#f2f2f2;width:100%;margin-left:1px;height:100px">
+ <div class="row">
+ <div class="column"
+ style="width: 20%; background-color: #f2f2f2; height: 35px; margin-left: 35px;">
+ <label class="labeltext">Select Avaliable VNF</label>
+ </div>
+ <div class="column"
+ style="background-color: #f2f2f2; width: 45%; height: 55px; margin-left: 0px;">
+ <select class="form-control" style="width: 100%; margin-top: 0px;"
+ name="select" ng-model="selectedValueVnf"
+ ng-change=selectVnf(selectedValueVnf) required>
+ <option ng-repeat="vnf in objvnfList" value="{{vnf.vnfId}}">VnfId-
+ {{vnf.vnfId}} VnfName- {{vnf.vnfName}}</option>
+ <option value="">Select VNF</option>
+ </select>
+ <div role="alert">
+ <span class="error" ng-show="myForm.select.$error.required">
+ Required!</span>
+ </div>
+ </div>
+ </div>
+<br><br>
+ <div class="row" style="background-color:#f2f2f2;width:100%;margin-left:1px;height:100px" ng-show="ShowResult">
<div class="column" style="width:30%;height:55px;margin-left:35px;">
<input type="file" style="width:300px" id="myFileInput" ng-model="file" accept=".json"/>
</div>
<th>Action</th>
</tr>
<tr ng-repeat="version in pagedItems[currentPage] | orderBy:sort.sortingOrder:sort.reverse">
- <td>{{$index+1}}</td>
+ <td>{{ ($index + 1) + (currentPage - 1) * itemsPerPage + 5}}</td>
<td>{{version.vnfversion}}</td>
<td>{{version.createdAt}}</td>
<td>{{version.updatedAt}}</td>
</td>
</tr>
- <td colspan="5">
+ <td colspan="5" ng-if="pagedItems.length > 5">
<!-- ng-show="pagedItems.length > 5" -->
<ul class="pagination pull-right">
<li ng-class="{disabled: currentPage == 0}"><a href
-<div id = "Div1" class="VersionMain" ng-show="showResult">
+<div id = "Div1" class="VersionMain" ng-show="showResult" >
<div class="versionHeading"><img src="static/images/compare.jpg" width=25 height="25" style="margin-left:5px;"> Version Comparision Result</div>
- <div class="columnsVersion">
- <ul class="price">
+ <table class="tableCompare" >
+ <td style="width:230px;">
+
+ <ul class="price" style="font-weight:bold;">
<li class="headerVersion">Attributes</li>
<div style="background-color:#E1E0DA;">
- <li class="listHeading">Config Details</li>
- <li ng-repeat="(key,value) in objCompareModel1.versionDetails">{{key}}</li>
+ <li class="listHeading">Config Details</li>
+ <li ng-repeat="(key,value) in objCompareModel1.versionDetails">{{key}}</li>
<hr class="separator">
</hr>
</div>
</hr>
</div>
</ul>
- </div>
- <div class="columnsVersion">
+ </td><td>
+
<ul class="price">
<li class="headerVersion" style="background-color:#807C7C">Version {{objCompareModel1.versionDetails.vnfversion}}</li>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Config Details</li>
- <li ng-repeat="(key,value) in objCompareModel1.versionDetails">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.versionDetails">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;" >
<li class="listHeading">VNF ID</li>
- <li ng-repeat="(key,value) in objCompareModel1.vnfIdInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.vnfIdInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">SERVICE STATUS</li>
- <li ng-repeat="(key,value) in objCompareModel1.serviceStatusInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.serviceStatusInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">VNF Topology Identifer</li>
- <li ng-repeat="(key,value) in objCompareModel1.vnfTopologyIdentifier">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.vnfTopologyIdentifier">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Operation Status</li>
- <li ng-repeat="(key,value) in objCompareModel1.operationStatus">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.operationStatus">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Request Info</li>
- <li ng-repeat="(key,value) in objCompareModel1.vnfRequestInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.vnfRequestInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Service Info</li>
- <li ng-repeat="(key,value) in objCompareModel1.serviceInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.serviceInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Request Information</li>
- <li ng-repeat="(key,value) in objCompareModel1.requestInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.requestInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
</hr>
</div>
</ul>
- </div>
-
- <div class="columnsVersion">
+
+</td><td>
+
<ul class="price">
<li class="headerVersion"style="background-color:#807C7C">Version {{objCompareModel2.versionDetails.vnfversion}}</li>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Config Details</li>
- <li ng-repeat="(key,value) in objCompareModel2.versionDetails">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.versionDetails">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">VNF ID</li>
- <li ng-repeat="(key,value) in objCompareModel2.vnfIdInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.vnfIdInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">SERVICE STATUS</li>
- <li ng-repeat="(key,value) in objCompareModel2.serviceStatusInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.serviceStatusInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">VNF Topology Identifer</li>
- <li ng-repeat="(key,value) in objCompareModel2.vnfTopologyIdentifier">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.vnfTopologyIdentifier">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Operation Status</li>
- <li ng-repeat="(key,value) in objCompareModel2.operationStatus">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.operationStatus">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Request Info</li>
- <li ng-repeat="(key,value) in objCompareModel2.vnfRequestInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.vnfRequestInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Service Info</li>
- <li ng-repeat="(key,value) in objCompareModel2.serviceInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.serviceInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Request Information</li>
- <li ng-repeat="(key,value) in objCompareModel2.requestInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel2.requestInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
</hr>
</div>
</ul>
- </div>
+
+</td><td ng-show=version3>
+ <ul class="price">
+ <li class="headerVersion"style="background-color:#807C7C">Version {{objCompareModel3.versionDetails.vnfversion}}</li>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Config Details</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.versionDetails">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">VNF ID</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.vnfIdInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">SERVICE STATUS</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.serviceStatusInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">VNF Topology Identifer</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.vnfTopologyIdentifier">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Operation Status</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.operationStatus">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Request Info</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.vnfRequestInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Service Info</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.serviceInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Service Request Header</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.requestHeader">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Request Information</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.requestInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">VNF Topology</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel3.topologyInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ </ul>
+
+</td><td ng-show=version4>
+
+ <ul class="price">
+ <li class="headerVersion"style="background-color:#807C7C">Version {{objCompareModel4.versionDetails.vnfversion}}</li>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Config Details</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.versionDetails">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">VNF ID</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.vnfIdInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">SERVICE STATUS</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.serviceStatusInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">VNF Topology Identifer</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.vnfTopologyIdentifier">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Operation Status</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.operationStatus">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Request Info</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.vnfRequestInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Service Info</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.serviceInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Service Request Header</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.requestHeader">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">Request Information</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.requestInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ <div style="background-color:#E1E0DA;">
+ <li class="listHeading">VNF Topology</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel4.topologyInfo">{{value}}</li>
+ <hr class="separator">
+ </hr>
+ </div>
+ </ul>
+
+ </td>
+</table>
</div>
\ No newline at end of file
<li class="headerVersion" style="background-color:#807C7C">Version {{objCompareModel1.versionDetails.vnfversion}}</li>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Config Details</li>
- <li ng-repeat="(key,value) in objCompareModel1.versionDetails">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.versionDetails">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;" >
<li class="listHeading">VNF ID</li>
- <li ng-repeat="(key,value) in objCompareModel1.vnfIdInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.vnfIdInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">SERVICE STATUS</li>
- <li ng-repeat="(key,value) in objCompareModel1.serviceStatusInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.serviceStatusInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">VNF Topology Identifer</li>
- <li ng-repeat="(key,value) in objCompareModel1.vnfTopologyIdentifier">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.vnfTopologyIdentifier">{{value}}</li>
<hr class="separator">
</hr>
</div>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Request Info</li>
- <li ng-repeat="(key,value) in objCompareModel1.vnfRequestInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.vnfRequestInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Service Info</li>
- <li ng-repeat="(key,value) in objCompareModel1.serviceInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.serviceInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">Request Information</li>
- <li ng-repeat="(key,value) in objCompareModel1.requestInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.requestInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<div style="background-color:#E1E0DA;">
<li class="listHeading">VNF Topology</li>
- <li style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.topologyInfo">{{value}}</li>
+ <li style="height:29px;overflow: auto;" style="height:29px;overflow: auto;" ng-repeat="(key,value) in objCompareModel1.topologyInfo">{{value}}</li>
<hr class="separator">
</hr>
</div>
<td>{{version.vnfname }}</td>
<td>{{version.vnfid}}</td>
</tr>
- <td colspan="4">
+ <td colspan="4" ng-show="pagedItems.length > 5" >
<!-- ng-show="pagedItems.length > 5" -->
- <ul class="pagination pull-right">
+ <ul class="pagination pull-right" >
<li ng-class="{disabled: currentPage == 0}"><a href
ng-click="prevPage()">«</a></li>
<li ng-repeat="n in range(pagedItems.length, currentPage, currentPage + gap) "
<td>{{version.vnfname }}</td>
<td>{{version.versionNo}}</td>
</tr>
- <td colspan="4">
+ <td colspan="4" ng-if="pagedItems.length > 5">
<ul class="pagination pull-right">
<li ng-class="{disabled: currentPage == 0}"><a href
ng-click="prevPage()">«</a></li>
Code Review / sdnc / oam.git / commitdiff
