add new class PG_CIMXML as means to convey link security info and IP address to slp

diff --git a/Schemas/Pegasus/InterOp/Makefile b/Schemas/Pegasus/InterOp/Makefile
index 729f78aa817cb1b19523bd43a119c22ff5d1ee85..3d6ca38eab1ed3ebf4a6b683cdfac4c6d7df2b73 100644 (file)
--- a/Schemas/Pegasus/InterOp/Makefile
+++ b/Schemas/Pegasus/InterOp/Makefile
@@ -28,6 +28,10 @@ repository:
        @ $(CIMMOFCLI) -R$(REPOSITORY_DIR) -I$(CIM_SCHEMA_DIR) -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
        @ echo +++++ Loading CIM_Event$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
        @ $(CIMMOFCLI) -R$(REPOSITORY_DIR) -I$(CIM_SCHEMA_DIR) -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof
+ifeq ($(PEGASUS_ENABLE_SLP),true) 
+       @ echo +++++ Loading CIM_Interop$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
+       @ $(CIMMOFCLI) -R$(REPOSITORY_DIR) -I$(CIM_SCHEMA_DIR) -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof
+endif
        @ echo +++++ Loading PG_InterOpSchema$(PG_SCHEMA_VER).mof into $(INTEROPNS) namespace...
        @ $(CIMMOFCLI) -R$(REPOSITORY_DIR) -I$(PG_MOF_PATH) -n$(INTEROPNS) $(PG_MOF_PATH)/PG_InterOpSchema$(PG_SCHEMA_VER).mof
 
@@ -36,6 +40,10 @@ repositoryServer:
        @ cimmof -I$(CIM_SCHEMA_DIR) -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
        @ echo +++++ Loading CIM_Event$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
        @ cimmof -I$(CIM_SCHEMA_DIR) -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof
+ifeq ($(PEGASUS_ENABLE_SLP),true) 
+       @ echo +++++ Loading CIM_Interop$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
+       @ cimmof -I$(CIM_SCHEMA_DIR) -n$(INTEROPNS) $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof
+endif
        @ echo +++++ Loading PG_InterOpSchema$(PG_SCHEMA_VER).mof into $(INTEROPNS) namespace...
        @ cimmof -I$(PG_MOF_PATH) -n$(INTEROPNS) $(PG_MOF_PATH)/PG_InterOpSchema$(PG_SCHEMA_VER).mof
 

diff --git a/Schemas/Pegasus/InterOp/VER20/PG_CIMXMLCommunicationMechanism20.mof b/Schemas/Pegasus/InterOp/VER20/PG_CIMXMLCommunicationMechanism20.mof
new file mode 100644 (file)
index 0000000..321edd9
--- /dev/null
+++ b/Schemas/Pegasus/InterOp/VER20/PG_CIMXMLCommunicationMechanism20.mof
@@ -0,0 +1,45 @@
+
+//%2003////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000, 2001, 2002  BMC Software, Hewlett-Packard Development
+// Company, L. P., IBM Corp., The Open Group, Tivoli Systems.
+// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.;
+// IBM Corp.; EMC Corporation, The Open Group.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
+// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
+// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//==============================================================================
+// ==================================================================
+// PG_CIMXMLCommunicationMechanism
+// ==================================================================
+
+   [Version ("2.0.0"), Description (
+       "This class specializes CIM_CIMXMLCommunicationMechanism, "
+       "adding properties required for Pegasus today. This was "
+       "temporarily added to get all the parameters into interop that "
+       "are required by the discovery mechanism. "
+       "The correct way to do this is the adapter but that is changing in "
+       "CIM 2.8 so we took the cheap approach." ) ]
+       
+class PG_CIMXMLCommunicationMechanism : CIM_CIMXMLCommunicationMechanism {
+
+        [Description ( "Is this link encrypted or not. http or https") ]
+    String namespaceType;
+        [Description ( "IP Address for this comm mechanins") ]
+    String IPAddress;
+
+};

diff --git a/Schemas/Pegasus/InterOp/VER20/PG_InterOpSchema20.mof b/Schemas/Pegasus/InterOp/VER20/PG_InterOpSchema20.mof
index 570a1891f9821f4fb4c1d1dc0531d63a62cb90c2..dc9ab90008d9e3d7f8fb9cf3bea2736f73dba659 100644 (file)
--- a/Schemas/Pegasus/InterOp/VER20/PG_InterOpSchema20.mof
+++ b/Schemas/Pegasus/InterOp/VER20/PG_InterOpSchema20.mof
@@ -1,2 +1,3 @@
 #pragma include ("PG_Events20.mof")
 #pragma include ("PG_ProviderModule20.mof")
+#pragma include ("PG_CIMXMLCommunicationMechanism20.mof")

diff --git a/Schemas/Pegasus/Internal/VER20/PG_SLPTemplate.mof b/Schemas/Pegasus/Internal/VER20/PG_SLPTemplate.mof
index bcc21f244b3968477d90dd48e8afa2834008bcd7..d33f1dbaa71176da22d3d1250e5a57aee6480cb1 100644 (file)
--- a/Schemas/Pegasus/Internal/VER20/PG_SLPTemplate.mof
+++ b/Schemas/Pegasus/Internal/VER20/PG_SLPTemplate.mof
@@ -12,15 +12,15 @@ class PG_WBEMSLPTemplate {
    string template_type="wbem";
    string template_version="1.0";
    string template_description="This template describes the attributes used for advertising CIM Servers.";
+   [key]
    string template_url_syntax;
    string service_hi_name;
-      [Description ("This string is used as a description of the CIM service "
-      "for human interfaces. This attribute MUST be the "
-      "CIM_ObjectManager.Description property value.") ]
+  [Description ("This string is used as a description of the CIM service "
+    "for human interfaces. This attribute MUST be the "
+    "CIM_ObjectManager.Description property value.") ]
    string service_hi_description;
    [Key]
    string service_id;
-   [key]
    string service_location_tcp;
    string CommunicationMechanism;
    string OtherCommunicationMechanismDescription;
@@ -33,10 +33,25 @@ class PG_WBEMSLPTemplate {
    string OtherAuthenticationDescription;
    string Namespace;
    string classinfo;
-   // Following 2 properties are a part of PEP30 but not a part of template. Not sure ig this needs to be included ?
-      
    string FunctionalProfilesSupported;
    string FunctionalProfileDescriptions;
+   
+   [ Description ("String representing the complete registered template. "
+       "This string is primarily a diagnostic to see what the produced template "
+       "looks like.")]
    string RegisteredTemplate;
    
+   [Description ("Time that this entry was registered with the SA") ]
+   datetime registeredTime;
+   
+   [Description ("Initiate the registration process based on the CIMServer "
+   "characteristics.") ]
+   Uint32 register();
+   
+   [ Description ("Remove any existing SLP registrations.") ]
+   Uint32 unregister();
+   
+   [ Description ("Force an update to any existing registrations.") ]
+   Uint32 update();
+   
 };